Merge remote-tracking branch 'upstream/master'

PrivateBin · Dec 6, 2024 · 684d65f · 684d65f
2 parents 526141f + e296cba
commit 684d65f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml
@@ -35,7 +35,7 @@ jobs:
 
       # Run OWASP scan
       - name: OWASP ZAP Full Scan
-        uses: zaproxy/action-full-scan@v0.11.0
+        uses: zaproxy/action-full-scan@v0.12.0
         with:
           # GitHub Token to create issues in the repository
           #token: # optional, default is ${{ github.token }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20.3
+FROM alpine:3.21
 
 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"