Skip to content

Commit

Permalink
Try with submodule update, comment out git deps/commands
Browse files Browse the repository at this point in the history
  • Loading branch information
bmhan12 committed Jun 27, 2024
1 parent b4971f7 commit 1621498
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
10 changes: 5 additions & 5 deletions docker/tpl-ubuntu-gcc.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ RUN apt-get install -y --no-install-recommends \
bison \
flex \
# GEOS patches some tpl. Remove when it's not the case anymore.
patch \
patch
# `ca-certificates` needed by `git` to download GEOS repo.
ca-certificates \
git
# ca-certificates \
# git


# Clone branch with spack configs
Expand All @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions scripts/docker-build-and-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 1621498

Please sign in to comment.