From 0b74b9a1cabbe16ae0f29be1172263fc3ad60316 Mon Sep 17 00:00:00 2001
From: lukemartinlogan <lukemartinlogan@gmail.com>
Date: Thu, 8 Feb 2024 13:33:57 -0600
Subject: [PATCH 1/2] Use 8G for memory and shm just in case

---
 ci/install_deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/install_deps.sh b/ci/install_deps.sh
index 764bfc0a5..1ab54d80a 100755
--- a/ci/install_deps.sh
+++ b/ci/install_deps.sh
@@ -10,8 +10,8 @@ docker run -d \
 --mount src=${PWD},target=/hermes,type=bind \
 --name hermes_deps_c \
 --network host \
---memory=4G \
---shm-size=4G \
+--memory=8G \
+--shm-size=8G \
 -p 4000:4000 \
 -p 4001:4001 \
 lukemartinlogan/hermes_deps \

From 3e75a4899309252c3638c06a0799067d6d1e66df Mon Sep 17 00:00:00 2001
From: lukemartinlogan <lukemartinlogan@gmail.com>
Date: Thu, 8 Feb 2024 14:13:44 -0600
Subject: [PATCH 2/2] Correct cache action hash

---
 .github/workflows/build_and_push_docker_images.yml | 2 +-
 docker/deps.Dockerfile                             | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_and_push_docker_images.yml b/.github/workflows/build_and_push_docker_images.yml
index a11b38ed4..ebdc777b1 100644
--- a/.github/workflows/build_and_push_docker_images.yml
+++ b/.github/workflows/build_and_push_docker_images.yml
@@ -25,7 +25,7 @@ jobs:
         id: docker-deps-cache
         with:
           path: ci/deps/deps.Dockerfile
-          key: docker-${{ hashFiles('ci/deps/deps.Dockerfile') }}
+          key: docker-${{ hashFiles('docker/deps.Dockerfile') }}
       - name: Checkout
         uses: actions/checkout@v3
       - name: Login to Docker Hub
diff --git a/docker/deps.Dockerfile b/docker/deps.Dockerfile
index 29939dd7c..5a7a83cf7 100644
--- a/docker/deps.Dockerfile
+++ b/docker/deps.Dockerfile
@@ -1,5 +1,5 @@
 # NOTE(llogan): This dockerfile assumes that
-# hermes github is mounted on /hermes
+# hermes github is the current working directory
 
 # Install ubuntu 22.04
 FROM ubuntu:22.04
@@ -38,9 +38,10 @@ ENV SPACK_DIR="${HOME}/spack"
 ENV SPACK_VERSION="v0.20.2"
 ENV HERMES_DEPS_DIR="${HOME}/hermes_deps"
 ENV HERMES_DIR="${HOME}/hermes"
+COPY ci/module_load.sh module_load.sh
 
 # Install Spack
-RUN . /hermes/ci/module_load.sh && \
+RUN . /module_load.sh && \
     git clone -b ${SPACK_VERSION} https://github.com/spack/spack ${SPACK_DIR} && \
     . "${SPACK_DIR}/share/spack/setup-env.sh" && \
     git clone -b dev https://github.com/lukemartinlogan/hermes.git ${HERMES_DEPS_DIR} && \
@@ -50,7 +51,7 @@ RUN . /hermes/ci/module_load.sh && \
     spack external find
 
 # Install hermes_shm
-RUN . /hermes/ci/module_load.sh && \
+RUN . /module_load.sh && \
     . "${SPACK_DIR}/share/spack/setup-env.sh" && \
     spack external find && \
     spack install hermes_shm@master+vfd+mpiio^mpich@3.3.2