diff --git a/.github/workflows/dockerhub-release.yaml b/.github/workflows/dockerhub-release.yaml index f874986a45..5eaf6af090 100644 --- a/.github/workflows/dockerhub-release.yaml +++ b/.github/workflows/dockerhub-release.yaml @@ -17,7 +17,7 @@ jobs: name: Retag and push image runs-on: ubuntu-latest environment: rc - if: github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main' + if: github.event.review.state == 'approved' && (github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main') steps: - name: Checkout uses: actions/checkout@v3 @@ -45,8 +45,7 @@ jobs: - name: Create variables id: vars run: | - echo "tag=$(echo '${{ github.event.pull_request.title }}' | sed -nE 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p')" >> $GITHUB_OUTPUT - + echo "tag=$(echo '${{ github.event.pull_request.title }}' | sed -nE 's/.*([0-9]+\.[0-9]+\.[0-9]+\S*)/\1/p')" >> $GITHUB_OUTPUT - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/Dockerfile b/Dockerfile index 84e9c98744..3231286ee4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Only for technical/build aims, built image will be with nginxinc/nginx-unprivileged:alpine according to the last step -FROM --platform=$BUILDPLATFORM alpine:3.18 AS generate-build-info +FROM --platform=$BUILDPLATFORM alpine:3.20.3 AS generate-build-info RUN mkdir -p /usr/src/app/build WORKDIR /usr/src ARG APP_VERSION=develop