fix: selectively copy items from hadoop-builder (#1201)

* fix: selectively copy items from hadoop-builder image to final image to not overwrite things from the base image

* Apply suggestion from @NickLarsenNZ

---------

Co-authored-by: Nick <[email protected]>

Author: lfrancke

hadoop/Dockerfile

@@ -191,7 +191,10 @@ FROM stackable/image/java-base AS final
 
 ARG PRODUCT
 ARG RELEASE
+ARG TARGETARCH
+ARG TARGETOS
 ARG HDFS_UTILS
+ARG ASYNC_PROFILER
 ARG STACKABLE_USER_UID
 
 LABEL \
@@ -203,7 +206,13 @@ LABEL \
     summary="The Stackable image for Apache Hadoop." \
     description="This image is deployed by the Stackable Operator for Apache Hadoop / HDFS."
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable /stackable
+
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/hadoop-${PRODUCT}-stackable${RELEASE} /stackable/hadoop-${PRODUCT}-stackable${RELEASE}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/hadoop-${PRODUCT}-stackable${RELEASE}-src.tar.gz /stackable/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/async-profiler-${ASYNC_PROFILER}-* /stackable/async-profiler-${ASYNC_PROFILER}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/jmx /stackable/jmx
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/protobuf-*-src.tar.gz /stackable/
+
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hdfs-utils-builder /stackable/hdfs-utils-${HDFS_UTILS}.jar /stackable/hadoop-${PRODUCT}-stackable${RELEASE}/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS}.jar
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hdfs-utils-builder /stackable/hdfs-utils-${HDFS_UTILS}-src.tar.gz /stackable
 
@@ -230,7 +239,20 @@ rm -rf /var/cache/yum
 # Without this fuse_dfs does not work
 # It is so non-root users (as we are) can mount a FUSE device and let other users access it
 echo "user_allow_other" > /etc/fuse.conf
-EOF
+
+ln -s "/stackable/hadoop-${PRODUCT}-stackable${RELEASE}" /stackable/hadoop
+chown --no-dereference "${STACKABLE_USER_UID}:0" /stackable/hadoop
+chmod g=u "/stackable/hadoop-${PRODUCT}-stackable${RELEASE}"
+chmod g=u /stackable/*-src.tar.gz
+
+ARCH="${TARGETARCH/amd64/x64}"
+mv /stackable/async-profiler-${ASYNC_PROFILER}* "/stackable/async-profiler-${ASYNC_PROFILER-}-${TARGETOS}-${ARCH}"
+chmod g=u "/stackable/async-profiler-${ASYNC_PROFILER-}-${TARGETOS}-${ARCH}"
+ln -s "/stackable/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}" /stackable/async-profiler
+chown --no-dereference "${STACKABLE_USER_UID}:0" /stackable/async-profiler
+
+chmod g=u /stackable/jmx
+
 
 # ----------------------------------------
 # Checks
@@ -241,7 +263,6 @@ EOF
 
 # Check that permissions and ownership in /stackable are set correctly
 # This will fail and stop the build if any mismatches are found.
-RUN <<EOF
 /bin/check-permissions-ownership.sh /stackable ${STACKABLE_USER_UID} 0
 EOF
 

shared/checks/check-permissions-ownership.sh

@@ -27,6 +27,8 @@ EXPECTED_UID=$2
 EXPECTED_GID=$3
 
 error_flag=0
+ownership_errors=0
+permission_errors=0
 
 # Check ownership
 while IFS= read -r -d '' entry; do
@@ -38,6 +40,7 @@ while IFS= read -r -d '' entry; do
         file=${remainder#* }
         echo "Ownership mismatch:  $file (Expected: $EXPECTED_UID:$EXPECTED_GID, Found: $uid:$gid)"
         error_flag=1
+        ((ownership_errors++))
     fi
 done < <(find "$DIRECTORY" -printf "%U %G %p\0")
 
@@ -48,13 +51,15 @@ while IFS= read -r -d '' entry; do
 
     if [[ "$owner_perms" != "$group_perms" ]]; then
         file="${entry:11}"
-        echo "Permission mismatch: $file (Owner: $owner_perms, Group: $group_perms)"
+        echo "Permission mismatch: $file (Owner: $owner_perms, Group: $group_perms, Expected: owner=group)"
         error_flag=1
+        ((permission_errors++))
     fi
 done < <(find "$DIRECTORY" -printf "%M %p\0")
 
 if [[ $error_flag -ne 0 ]]; then
     echo "Permission and Ownership checks failed for $DIRECTORY!"
+    echo "Found $ownership_errors ownership mismatches and $permission_errors permission mismatches"
     exit 1
 fi