From 56f24722c2d58a08fbe908c6540831b3f96f9333 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Mon, 12 Jun 2023 13:16:28 +0200
Subject: [PATCH] Fix up injecting SSL CA

---
 php/Makefile          | 12 ++++++------
 php/nginx/nginx.runit |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/php/Makefile b/php/Makefile
index d28730e..8884307 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -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
\ No newline at end of file
+all: bake
diff --git a/php/nginx/nginx.runit b/php/nginx/nginx.runit
index f89ca15..5f963d0 100755
--- a/php/nginx/nginx.runit
+++ b/php/nginx/nginx.runit
@@ -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