From 223b5b7fc566b8e367f0cc798db05a0fd64f70d6 Mon Sep 17 00:00:00 2001
From: Brian Han <han12@llnl.gov>
Date: Thu, 27 Jun 2024 08:21:31 -0700
Subject: [PATCH] Try with submodule update, comment out git deps/commands

---
 docker/tpl-ubuntu-gcc.Dockerfile | 8 ++++----
 scripts/docker-build-and-push.sh | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docker/tpl-ubuntu-gcc.Dockerfile b/docker/tpl-ubuntu-gcc.Dockerfile
index e583a977..d8848f84 100644
--- a/docker/tpl-ubuntu-gcc.Dockerfile
+++ b/docker/tpl-ubuntu-gcc.Dockerfile
@@ -93,8 +93,8 @@ RUN apt-get install -y --no-install-recommends \
 # GEOS patches some tpl. Remove when it's not the case anymore.
     patch \
 # `ca-certificates`  needed by `git` to download GEOS repo.
-    ca-certificates \
-    git
+#    ca-certificates \
+#    git
 
 
 # Clone branch with spack configs
@@ -112,8 +112,8 @@ RUN apt-get install -y --no-install-recommends \
 #     mkdir -p ${GEOSX_TPL_DIR} && \
 RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
      mkdir -p ${GEOSX_TPL_DIR} && \
-     git submodule init scripts/uberenv && \
-     git submodule update && \
+#     git submodule init scripts/uberenv && \
+#     git submodule update && \
      ./scripts/uberenv/uberenv.py \
        --spec "%gcc@${GCC_MAJOR_VERSION} +docs" \
        --spack-env-file=${SRC_DIR}/docker/spack.yaml \
diff --git a/scripts/docker-build-and-push.sh b/scripts/docker-build-and-push.sh
index ba0f15a2..7d8776e9 100644
--- a/scripts/docker-build-and-push.sh
+++ b/scripts/docker-build-and-push.sh
@@ -3,6 +3,10 @@ env
 
 # We save memory for the docker context
 echo .git > .dockerignore
+
+# Get uberenv submodule
+git submodule update --init scripts/uberenv
+
 # This script will build and push a DOCKER_REPOSITORY:DOCKER_TAG image build from DOCKERFILE
 # with (optional) DOCKER_COMPILER_BUILD_ARG build arguments.
 # A specific host-config file can be defined through variable HOST_CONFIG.