Skip to content

Commit

Permalink
workflows: Try edit build arg name
Browse files Browse the repository at this point in the history
  • Loading branch information
ZoeLeibowitz committed Jun 19, 2024
1 parent 33c806f commit 7d82411
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pytest-petsc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:

- name: Build docker image
run: |
docker build . --file docker/Dockerfile.devito --tag devito_img --build-arg base=devitocodes/bases:cpu-${{ matrix.arch }} --build-arg petsc=petsc
docker build . --file docker/Dockerfile.devito --tag devito_img --build-arg base=devitocodes/bases:cpu-${{ matrix.arch }} --build-arg PETSC=petsc
- name: Set run prefix
run: |
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile.devito
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RUN apt-get update && apt-get install -y libopenblas-serial-dev git pkgconf mpic
FROM $base as user
# COPY is much faster than RUN chown by order of magnitude so we have a final step that
# just copies the built image into the user.
ARG petsc=""
ARG PETSC=""

# User/Group Ids
ARG USER_ID=1000
Expand All @@ -83,7 +83,7 @@ RUN groupadd -g ${GROUP_ID} app && \
install -d -m 0755 -o app -g app /app && \
chown -R app:app $APP_HOME

COPY --from=${petsc}builder --chown=app:app /app /app
COPY --from=${PETSC}builder --chown=app:app /app /app

ENV PETSC_ARCH="devito_build"
ENV PETSC_DIR="/opt/petsc/petsc"
Expand All @@ -95,10 +95,10 @@ ADD --chown=app:app docker/entrypoint.sh /docker-entrypoint.sh
RUN chmod +x /print-defaults /jupyter /tests /docker-entrypoint.sh

# Venv
COPY --from=${petsc}builder --chown=app:app /venv /venv
COPY --from=${PETSC}builder --chown=app:app /venv /venv

# opt
COPY --from=${petsc}builder --chown=app:app /opt /opt
COPY --from=${PETSC}builder --chown=app:app /opt /opt

# Install codecov
WORKDIR /app/devito
Expand Down

0 comments on commit 7d82411

Please sign in to comment.