Merge branch 'master' into composer
This commit is contained in:
commit
7bb9a07b70
2 changed files with 3 additions and 3 deletions
2
.github/workflows/owasp.yml
vendored
2
.github/workflows/owasp.yml
vendored
|
@ -35,7 +35,7 @@ jobs:
|
||||||
|
|
||||||
# Run OWASP scan
|
# Run OWASP scan
|
||||||
- name: OWASP ZAP Full Scan
|
- name: OWASP ZAP Full Scan
|
||||||
uses: zaproxy/action-full-scan@v0.9.0
|
uses: zaproxy/action-full-scan@v0.10.0
|
||||||
with:
|
with:
|
||||||
# GitHub Token to create issues in the repository
|
# GitHub Token to create issues in the repository
|
||||||
#token: # optional, default is ${{ github.token }}
|
#token: # optional, default is ${{ github.token }}
|
||||||
|
|
|
@ -3,7 +3,7 @@ FROM alpine:3.19.1
|
||||||
ARG ALPINE_PACKAGES="php83-iconv php83-pdo_mysql php83-pdo_pgsql php83-openssl php83-simplexml"
|
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 COMPOSER_PACKAGES="aws/aws-sdk-php google/cloud-storage"
|
||||||
ARG PBURL=https://github.com/PrivateBin/PrivateBin/
|
ARG PBURL=https://github.com/PrivateBin/PrivateBin/
|
||||||
ARG RELEASE=1.7.1
|
ARG RELEASE=1.7.2
|
||||||
ARG UID=65534
|
ARG UID=65534
|
||||||
ARG GID=82
|
ARG GID=82
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ RUN \
|
||||||
fi \
|
fi \
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
&& apk upgrade --no-cache \
|
&& apk upgrade --no-cache \
|
||||||
&& apk add --no-cache composer gnupg git nginx php83 php83-fpm php83-gd \
|
&& apk add --no-cache composer gnupg git nginx php83 php83-ctype php83-fpm php83-gd \
|
||||||
php83-opcache s6 tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \
|
php83-opcache s6 tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \
|
||||||
# Stabilize php config location
|
# Stabilize php config location
|
||||||
&& mv /etc/php83 /etc/php \
|
&& mv /etc/php83 /etc/php \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue