diff --git a/.github/workflows/docker-build-push.yaml b/.github/workflows/docker-build-push.yaml index e72c967..61ec110 100644 --- a/.github/workflows/docker-build-push.yaml +++ b/.github/workflows/docker-build-push.yaml @@ -3,7 +3,7 @@ name: Docker build & push image on: push: branches: [v4] - tags: ["v*"] + tags: ["v*"] pull_request: branches: [v4] paths: @@ -78,7 +78,7 @@ jobs: id: build-and-push uses: docker/build-push-action@v6 with: - push: true + push: ${{ github.event_name != 'pull_request' }} build-args: | GIT_SHA=${{ env.GITHUB_SHA }} DOCKER_LABEL=sha-${{ env.GITHUB_SHA_SHORT }} diff --git a/Dockerfile b/Dockerfile index 1d9e591..4493853 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-slim as builder +FROM node:20-slim AS builder WORKDIR /usr/src/app COPY package.json . COPY package-lock.json* .