Merge remote-tracking branch 'upstream/master'

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

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -25,19 +25,24 @@ jobs:
         uses: docker/setup-qemu-action@v3
         with:
           platforms: linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
+          platforms: linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
           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'
+        uses: docker/login-action@v3
+        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'
+        uses: docker/login-action@v3
+        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
 

diff --git a/buildx.sh b/buildx.sh
@@ -22,6 +22,7 @@ build_image() {
 push_image() {
     # shellcheck disable=SC2068
     docker buildx build \
+        --platform linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \
         --platform linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \
         --pull \
         --no-cache \