Merge remote-tracking branch 'upstream/master'

PrivateBin · Dec 15, 2023 · 8c4bd59 · 8c4bd59
2 parents ed725fb + df9b030
commit 8c4bd59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -31,13 +31,13 @@ jobs:
           install: true
       - name: Login to DockerHub
         uses: docker/login-action@v3
-        if: (github.ref != 'refs/heads/master' && github.event_name != 'pull_request') || github.event_name == 'schedule'
+        if: ${{ github.event_name != 'pull_request' && (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) }}
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
-        if: (github.ref != 'refs/heads/master' && github.event_name != 'pull_request') || github.event_name == 'schedule'
+        if: ${{ github.event_name != 'pull_request' && (github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')) }}
         with:
           registry: ghcr.io
           username: privatebin

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.19.0
 ARG ALPINE_PACKAGES="php83-iconv php83-pdo_mysql php83-pdo_pgsql php83-openssl php83-simplexml"
 ARG COMPOSER_PACKAGES="aws/aws-sdk-php google/cloud-storage"
 ARG PBURL=https://github.com/PrivateBin/PrivateBin/
-ARG RELEASE=1.6.1
+ARG RELEASE=1.6.2
 ARG UID=65534
 ARG GID=82