Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Retest github docker action #678

Merged
merged 2 commits into from
Feb 8, 2024
Merged

Retest github docker action #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b74b9a
Use 8G for memory and shm just in case
lukemartinlogan Feb 8, 2024
3e75a48
Correct cache action hash
lukemartinlogan Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_and_push_docker_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
7 changes: 4 additions & 3 deletions docker/deps.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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} && \
Expand All @@ -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^[email protected]
Expand Down
Loading