Merge branch 'master' of github.com:PrivateBin/docker-nginx-fpm-alpine

This commit is contained in:
El RIDO 2023-01-21 19:44:49 +01:00
commit 497843094e
2 changed files with 6 additions and 3 deletions

View file

@ -1,6 +1,6 @@
FROM alpine:3.17.1 FROM alpine:3.17.1
ARG ALPINE_PACKAGES="php81-pdo_mysql php81-pdo_pgsql php81-openssl php81-simplexml" ARG ALPINE_PACKAGES="php81-iconv php81-pdo_mysql php81-pdo_pgsql php81-openssl php81-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.5.1 ARG RELEASE=1.5.1
@ -22,10 +22,13 @@ RUN \
ALPINE_PACKAGES="$(echo ${ALPINE_PACKAGES} | sed 's/,/ /g')" ;\ ALPINE_PACKAGES="$(echo ${ALPINE_PACKAGES} | sed 's/,/ /g')" ;\
ALPINE_COMPOSER_PACKAGES="" ;\ ALPINE_COMPOSER_PACKAGES="" ;\
if [ -n "${COMPOSER_PACKAGES}" ] ; then \ if [ -n "${COMPOSER_PACKAGES}" ] ; then \
ALPINE_COMPOSER_PACKAGES="php81-mbstring php81-phar" ;\ ALPINE_COMPOSER_PACKAGES="php81-phar" ;\
if [ -n "${ALPINE_PACKAGES##*php81-curl*}" ] ; then \ if [ -n "${ALPINE_PACKAGES##*php81-curl*}" ] ; then \
ALPINE_COMPOSER_PACKAGES="php81-curl ${ALPINE_COMPOSER_PACKAGES}" ;\ ALPINE_COMPOSER_PACKAGES="php81-curl ${ALPINE_COMPOSER_PACKAGES}" ;\
fi ;\ fi ;\
if [ -n "${ALPINE_PACKAGES##*php81-mbstring*}" ] ; then \
ALPINE_COMPOSER_PACKAGES="php81-mbstring ${ALPINE_COMPOSER_PACKAGES}" ;\
fi ;\
RAWURL="$(echo ${PBURL} | sed s/github.com/raw.githubusercontent.com/)" ;\ RAWURL="$(echo ${PBURL} | sed s/github.com/raw.githubusercontent.com/)" ;\
fi \ fi \
# Install dependencies # Install dependencies

View file

@ -64,7 +64,7 @@ main() {
BUILD_ARGS="--build-arg ALPINE_PACKAGES=php81-pdo_mysql,php81-pdo_pgsql --build-arg COMPOSER_PACKAGES=" BUILD_ARGS="--build-arg ALPINE_PACKAGES=php81-pdo_mysql,php81-pdo_pgsql --build-arg COMPOSER_PACKAGES="
;; ;;
s3) s3)
BUILD_ARGS="--build-arg ALPINE_PACKAGES=php81-curl,php81-openssl,php81-simplexml --build-arg COMPOSER_PACKAGES=aws/aws-sdk-php" BUILD_ARGS="--build-arg ALPINE_PACKAGES=php81-curl,php81-mbstring,php81-openssl,php81-simplexml --build-arg COMPOSER_PACKAGES=aws/aws-sdk-php"
;; ;;
*) *)
BUILD_ARGS="" BUILD_ARGS=""