This is an automated email from the ASF dual-hosted git repository.
dbecker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new daa7f8ad8 IMPALA-13328: Fix missing krb5-config in building
impala_quickstart_client docker image
daa7f8ad8 is described below
commit daa7f8ad88bdef886641c32b8580064f79d51ee7
Author: stiga-huang <[email protected]>
AuthorDate: Mon Aug 26 21:03:33 2024 +0800
IMPALA-13328: Fix missing krb5-config in building impala_quickstart_client
docker image
Building the impala_quickstart_client docker image failed by krb5-config
not found. It's installed by the libkrb5-dev package. This patch adds it
to fix the build failure. Also improves
docker/publish_images_to_apache.sh to skip inexisting images (usually
due to not be built). Updates the quickstart_hms image to base on Ubuntu
18.04.
Also fixes an issue that docker/CMakeLists.txt doesn't dump all the
image names to docker/docker-images.txt
Tests:
- Verified the quickstart images on MacOS.
Change-Id: Ieaa9878fa9cd9902ac883866c82e224889940615
Reviewed-on: http://gerrit.cloudera.org:8080/21725
Reviewed-by: Impala Public Jenkins <[email protected]>
Tested-by: Impala Public Jenkins <[email protected]>
---
docker/CMakeLists.txt | 2 ++
docker/publish_images_to_apache.sh | 4 ++++
docker/quickstart_client/Dockerfile | 2 +-
docker/quickstart_hms/Dockerfile | 2 +-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/docker/CMakeLists.txt b/docker/CMakeLists.txt
index 508e11199..4cf61c33b 100644
--- a/docker/CMakeLists.txt
+++ b/docker/CMakeLists.txt
@@ -169,6 +169,8 @@ if (NOT ${DISTRO_BASE_IMAGE} STREQUAL "UNSUPPORTED")
ADD_DEPENDENCIES(docker_debug_images ${debug_target})
ADD_DEPENDENCIES(docker_debug_java11_images ${debug_java11_target})
ADD_DEPENDENCIES(docker_debug_java17_images ${debug_java17_target})
+ # add_daemon_docker_image modifies 'exported_image_names'. Publish it to
the parent scope.
+ set(exported_image_names "${exported_image_names}" PARENT_SCOPE)
endfunction()
# Stamp out image targets for all of the Impala daemons.
diff --git a/docker/publish_images_to_apache.sh
b/docker/publish_images_to_apache.sh
index 42892f33b..bf0bcdb2a 100755
--- a/docker/publish_images_to_apache.sh
+++ b/docker/publish_images_to_apache.sh
@@ -72,6 +72,10 @@ do
# with a prefix, e.g. IMPALA_QUICKSTART_IMAGE_PREFIX in the quickstart
docker compose.
DST="${TARGET_REPO}:${VERSION}-${IMAGE}"
DIGEST=$(docker images --no-trunc --quiet "${IMAGE}")
+ if [[ -z $DIGEST ]]; then
+ echo "${IMAGE} image not found"
+ continue
+ fi
echo "Publishing ${IMAGE} (${DIGEST}) to ${DST}"
docker tag $IMAGE "$DST"
docker push "$DST"
diff --git a/docker/quickstart_client/Dockerfile
b/docker/quickstart_client/Dockerfile
index 1f8c597c7..9ae67afe1 100644
--- a/docker/quickstart_client/Dockerfile
+++ b/docker/quickstart_client/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update && \
apt-get install -y \
sudo netcat-openbsd less curl iproute2 vim iputils-ping \
libsasl2-dev libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit \
- tzdata krb5-user ${PIP} && \
+ tzdata krb5-user libkrb5-dev ${PIP} && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
diff --git a/docker/quickstart_hms/Dockerfile b/docker/quickstart_hms/Dockerfile
index 7807ce280..203f9d482 100644
--- a/docker/quickstart_hms/Dockerfile
+++ b/docker/quickstart_hms/Dockerfile
@@ -17,7 +17,7 @@
# Build a base HMS image for quickstart purposes.
-ARG BASE_IMAGE=ubuntu:16.04
+ARG BASE_IMAGE=ubuntu:18.04
FROM ${BASE_IMAGE}
# Common label arguments.
