Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jacquesfize committed Feb 17, 2025
2 parents a54ccc4 + 9b21afc commit 499e256
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ jobs:

- name: Build and export image
uses: docker/build-push-action@v4
if: ${{ github.event_name == 'release' }}
with:
context: .
file: ./build/Dockerfile-geonature-backend
target: prod-extra
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: GEONATURE_BACKEND_IMAGE=ghcr.io/pnx-si/geonature-backend:${{github.ref_name}}
build-args: GEONATURE_BACKEND_IMAGE=ghcr.io/pnx-si/geonature-backend:2.15.3

frontend:
name: Build geonature frontend docker image
Expand Down Expand Up @@ -85,11 +86,12 @@ jobs:

- name: Build and export image
uses: docker/build-push-action@v4
if: ${{ github.event_name == 'release' }}
with:
context: .
file: ./build/Dockerfile-geonature-frontend
target: prod-extra
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: GEONATURE_FRONTEND_IMAGE=ghcr.io/pnx-si/geonature-frontend:${{github.ref_name}}
build-args: GEONATURE_FRONTEND_IMAGE=ghcr.io/pnx-si/geonature-frontend:2.15.3

0 comments on commit 499e256

Please sign in to comment.