Benzine/Docker-Runit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix up injecting SSL CA

Browse source
This commit is contained in:
Greyscale 2023-06-12 13:16:28 +02:00
parent 5c794f1b03
commit 56f24722c2
No known key found for this signature in database
GPG key ID: 74BAFF55434DA4B2
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
php/Makefile
View file

@ -7,7 +7,7 @@ docker-marshall:
docker-php-core:
$(BUILD) \
--build-arg PHP_PACKAGES="git mariadb-client php${PHP_VERSION}-apcu php${PHP_VERSION}-bcmath php${PHP_VERSION}-bz2 php${PHP_VERSION}-cli php${PHP_VERSION}-curl php${PHP_VERSION}-gd php${PHP_VERSION}-imap php${PHP_VERSION}-imagick php${PHP_VERSION}-intl php${PHP_VERSION}-ldap php${PHP_VERSION}-mbstring php${PHP_VERSION}-memcache php${PHP_VERSION}-mysql php${PHP_VERSION}-opcache php${PHP_VERSION}-pgsql php${PHP_VERSION}-phpdbg php${PHP_VERSION}-pspell php${PHP_VERSION}-redis php${PHP_VERSION}-soap php${PHP_VERSION}-sqlite php${PHP_VERSION}-xdebug php${PHP_VERSION}-xml php${PHP_VERSION}-zip postgresql-client" \
--build-arg PHP_PACKAGES="git htop mariadb-client php${PHP_VERSION}-apcu php${PHP_VERSION}-bcmath php${PHP_VERSION}-bz2 php${PHP_VERSION}-cli php${PHP_VERSION}-curl php${PHP_VERSION}-gd php${PHP_VERSION}-imap php${PHP_VERSION}-imagick php${PHP_VERSION}-intl php${PHP_VERSION}-ldap php${PHP_VERSION}-mailparse php${PHP_VERSION}-mbstring php${PHP_VERSION}-memcache php${PHP_VERSION}-mongodb php${PHP_VERSION}-mysql php${PHP_VERSION}-opcache php${PHP_VERSION}-pgsql php${PHP_VERSION}-phpdbg php${PHP_VERSION}-pspell php${PHP_VERSION}-redis php${PHP_VERSION}-soap php${PHP_VERSION}-sqlite php${PHP_VERSION}-xdebug php${PHP_VERSION}-xml php${PHP_VERSION}-zip postgresql-client" \
--build-arg PHP_VERSION=${PHP_VERSION} \
--tag benzine/php:core-${PHP_VERSION} \
--target php-core \
@ -26,13 +26,13 @@ docker-php-flavour:
bake-flavours:
$(MAKE) docker-php-flavour FLAVOUR=cli
$(MAKE) docker-php-flavour FLAVOUR=nginx
$(MAKE) docker-php-flavour FLAVOUR=apache
#$(MAKE) docker-php-flavour FLAVOUR=apache
bake:
$(MAKE) docker-marshall
$(MAKE) docker-php-core bake-flavours PHP_VERSION=7.3
$(MAKE) docker-php-core bake-flavours PHP_VERSION=7.4
$(MAKE) docker-php-core bake-flavours PHP_VERSION=8.0
#$(MAKE) docker-php-core bake-flavours PHP_VERSION=7.3
#$(MAKE) docker-php-core bake-flavours PHP_VERSION=7.4
#$(MAKE) docker-php-core bake-flavours PHP_VERSION=8.0
$(MAKE) docker-php-core bake-flavours PHP_VERSION=8.1
all: bake
all: bake

4
php/nginx/nginx.runit
View file

@ -4,6 +4,10 @@ if [ -z "${SSL_CERTIFICATE}" ]; then
else
echo "Setting /certs/example.crt and /certs/example.key"
echo "${SSL_CERTIFICATE}" > /certs/example.crt
if [ -n "${SSL_CERTIFICATE_CA}" ]; then
echo "Adding CA to /certs/example.crt"
echo "${SSL_CERTIFICATE_CA}" >> /certs/example.crt
fi
echo "${SSL_CERTIFICATE_KEY}" > /certs/example.key
fi