Pass scripts/uberenv as a separate named BuildKit context and mount it explicitly in the Dockerfile

Author: victorapm

docker/tpl-ubuntu-hip.Dockerfile

@@ -120,13 +120,13 @@ RUN apt-get update && \
 #
 # NOTE: We use a read-only mount (no `readwrite`) because Docker 29.x's
 # built-in BuildKit has a bug where `--mount=src=.,readwrite` mounts an
-# empty directory instead of exposing the build context.  We work around
-# it by mounting the context read-only at /tmp/src and copying only the
-# small set of files uberenv actually needs into the writable container
-# filesystem before running.
+# empty directory instead of exposing the build context. We also mount the
+# uberenv submodule as a separate named context, because BuildKit's git-aware
+# handling of the main repo context drops submodule contents.
 RUN --mount=src=.,dst=/tmp/src \
-     mkdir -p ${SRC_DIR}/scripts ${GEOSX_TPL_DIR} && \
-     cp -r /tmp/src/docker/_uberenv_bundle ${SRC_DIR}/scripts/uberenv && \
+     --mount=from=uberenv,target=/tmp/uberenv \
+     mkdir -p ${SRC_DIR}/scripts/uberenv ${GEOSX_TPL_DIR} && \
+     cp -r /tmp/uberenv/. ${SRC_DIR}/scripts/uberenv/ && \
      cp -r /tmp/src/scripts/spack_packages ${SRC_DIR}/scripts/ && \
      cp -r /tmp/src/scripts/spack_configs  ${SRC_DIR}/scripts/ && \
      cp    /tmp/src/.uberenv_config.json   ${SRC_DIR}/ && \

scripts/docker-build.sh

@@ -7,11 +7,6 @@ echo .git > .dockerignore
 
 # Get uberenv submodule
 git submodule update --init --force scripts/uberenv
-# BuildKit's git-aware context builder treats submodules as gitlinks and sends
-# only an empty directory placeholder for them.  Work around this by copying
-# uberenv into a plain (non-submodule) path that BuildKit will include in full.
-rm -rf docker/_uberenv_bundle
-cp -r scripts/uberenv docker/_uberenv_bundle
 
 
 # This script will build an image from TPL_DOCKERFILE
@@ -27,6 +22,7 @@ INSTALL_DIR=${INSTALL_DIR_ROOT}/GEOS_TPL-${DOCKER_TAG}-${COMMIT:0:7}
 echo "Installation directory is ${INSTALL_DIR}"
 
 docker build --progress=plain ${DOCKER_COMPILER_BUILD_ARG} \
+--build-context uberenv=./scripts/uberenv \
 --build-arg HOST_CONFIG=${HOST_CONFIG} \
 --build-arg DOCKER_ROOT_IMAGE=${DOCKER_ROOT_IMAGE} \
 --build-arg INSTALL_DIR=${INSTALL_DIR} \

scripts/run-rocm-ci-local.sh

@@ -162,6 +162,7 @@ install_dir="${install_dir_root}/GEOS_TPL-${docker_tag}-${commit_sha:0:7}"
 docker_args=(
   build
   --progress=plain
+  --build-context "uberenv=${repo_root}/scripts/uberenv"
   --build-arg "DOCKER_ROOT_IMAGE=${docker_root_image}"
   --build-arg "AMDGPU_TARGET=${amdgpu_target}"
   --build-arg "INSTALL_DIR=${install_dir}"