From 3c89cf240eeb8fe88edd79ea5d97f2c70a4c868a Mon Sep 17 00:00:00 2001 From: Valentin LE BESCOND Date: Wed, 13 Nov 2024 11:34:22 +0100 Subject: [PATCH] Revert "fix: update dockerfile" This reverts commit e1e30b6bca7bfa3b85a261c5c5c8f65ee1c6d448. --- .github/workflows/docker-publish.yml | 3 +-- containers/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index b64cfbb..b377835 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -76,8 +76,7 @@ jobs: id: build-and-push uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0 with: - context: ./ - file: ./containers/Dockerfile + context: ./containers push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/containers/Dockerfile b/containers/Dockerfile index 7636a02..f0d5e01 100644 --- a/containers/Dockerfile +++ b/containers/Dockerfile @@ -38,7 +38,7 @@ RUN java -version && \ conda --version && \ which osmosis -COPY ./environment.yml /tmp/environment_eqasim.yml +COPY ../environment.yml /tmp/environment_eqasim.yml # Copy the environment.yml file into the container if env_path is set (else will create an empty directory) COPY ${env_path} /tmp/environment_custom.yml