single hive image

Author: abstractdog

packaging/src/docker/Dockerfile-llap

@@ -87,22 +87,18 @@ After building successfully, you get a Docker image named `apache/hive` by defau
 
 ##### Build LLAP Daemon image
 
-To build a dedicated LLAP Daemon image (using `Dockerfile-llap` under the hood), invoke `build.sh` with the `-llap` flag. For example:
+To build the image used by LLAP Daemon (using the common `Dockerfile` and `entrypoint.sh` under the hood), invoke `build.sh`. For example:
 
 ```shell
-./build.sh -hive 4.2.0 -hadoop 3.4.1 -tez 0.10.5 -llap
+./build.sh -hive 4.2.0 -hadoop 3.4.1 -tez 0.10.5
 ```
 
 or, relying on versions from `pom.xml`:
 
 ```shell
-./build.sh -llap
+./build.sh
 ```
 
-When `-llap` is specified, an additional image is produced alongside `apache/hive:${HIVE_VERSION}`:
-
-- `apache/hive-llap:${HIVE_VERSION}` (or `${repo}/hive-llap:${HIVE_VERSION}` if `-repo` is used).
-
 #### Run services
 
 Before going further, we should define the environment variable `HIVE_VERSION` first.
@@ -217,14 +213,14 @@ Use the following workflow from `packaging/src/docker`:
 docker-compose --profile llap -f docker-compose.yml down --rmi local # cleanup previous containers and images
 
 export POSTGRES_LOCAL_PATH=... # set the path to the postgres driver jar on the host machine
-./build.sh -hive 4.2.0 -hadoop 3.4.1 -tez 0.10.5 -llap # build LLAP image: already described earlier
+./build.sh -hive 4.2.0 -hadoop 3.4.1 -tez 0.10.5 # build image from the common Dockerfile
 docker compose -f docker-compose.yml up -d
 ```
 
 To view LLAP logs:
 
 ```shell
-docker compose --profile llap -f docker-compose.yml logs -f llap
+docker compose --profile llap -f docker-compose.yml logs -f llapdaemon1 llapdaemon2
 ```
 
 To stop and remove the LLAP stack:

packaging/src/docker/README.md

@@ -20,17 +20,15 @@ set -eux
 HIVE_VERSION=
 HADOOP_VERSION=
 TEZ_VERSION=
-BUILD_LLAP=false
 usage() {
     cat <<EOF 1>&2
-Usage: $0 [-h] [-hadoop <Hadoop version>] [-tez <Tez version>] [-hive <Hive version>] [-repo <Docker repo>] [-llap]
-Build the Hive Docker image (and optionally the LLAP Daemon image)
+Usage: $0 [-h] [-hadoop <Hadoop version>] [-tez <Tez version>] [-hive <Hive version>] [-repo <Docker repo>]
+Build the Hive Docker image (reused for LLAP too)
 -help                Display help
 -hadoop              Build image with the specified Hadoop version
 -tez                 Build image with the specified Tez version
 -hive                Build image with the specified Hive version
 -repo                Docker repository
--llap                Additionally build the LLAP Daemon image
 EOF
 }
 
@@ -60,10 +58,6 @@ while [ $# -gt 0 ]; do
       REPO=$1
       shift
       ;;
-    -llap)
-      BUILD_LLAP=true
-      shift
-      ;;
     *)
       shift
       ;;
@@ -137,16 +131,4 @@ docker build \
         --build-arg "HADOOP_VERSION=$HADOOP_VERSION" \
         --build-arg "TEZ_VERSION=$TEZ_VERSION"
 
-if [ "$BUILD_LLAP" = true ]; then
-  cp "$SOURCE_DIR/packaging/src/docker/entrypoint-llap.sh" "$WORK_DIR/"
-  cp "$SOURCE_DIR/packaging/src/docker/Dockerfile-llap" "$WORK_DIR/"
-  docker build \
-          "$WORK_DIR" \
-          -f "$WORK_DIR/Dockerfile-llap" \
-          -t "$repo/hive-llap:$HIVE_VERSION" \
-          --build-arg "HADOOP_VERSION=$HADOOP_VERSION" \
-          --build-arg "HIVE_VERSION=$HIVE_VERSION" \
-          --build-arg "TEZ_VERSION=$TEZ_VERSION"
-fi
-
 rm -r "${WORK_DIR}"

packaging/src/docker/build.sh

@@ -175,14 +175,15 @@ services:
   llapdaemon1:
     profiles:
       - llap
-    image: apache/hive-llap:${HIVE_VERSION}
+    image: apache/hive:${HIVE_VERSION}
     container_name: llapdaemon1
     hostname: llapdaemon1
     depends_on:
       - zookeeper
     restart: unless-stopped
     environment:
       USER: hive
+      SERVICE_NAME: 'llap'
       # Basic LLAP daemon configuration
       LLAP_MEMORY_MB: '1024'
       LLAP_EXECUTORS: '1'
@@ -211,14 +212,15 @@ services:
   llapdaemon2:
     profiles:
       - llap
-    image: apache/hive-llap:${HIVE_VERSION}
+    image: apache/hive:${HIVE_VERSION}
     container_name: llapdaemon2
     hostname: llapdaemon2
     depends_on:
       - zookeeper
     restart: unless-stopped
     environment:
       USER: hive
+      SERVICE_NAME: 'llap'
       # Basic LLAP daemon configuration
       LLAP_MEMORY_MB: '1024'
       LLAP_EXECUTORS: '1'