From d3c0c495ebcd3a770e26fcf30420ed90ed1f0ee9 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Tue, 5 Dec 2023 10:59:30 -0800
Subject: [PATCH] Release 7.7.3 - See CHANGELOG.md

---
 CHANGELOG.md                       | 6 ++++++
 Dockerfile                         | 8 ++------
 Dockerfile.debian                  | 1 -
 install/etc/cont-init.d/20-php-fpm | 4 +++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 012cb68..4295e54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.7.3 2023-12-05 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Change build for Alpine PHP 8.3 to not include 4 PECL extensions
+
+
 ## 7.7.2 2023-11-28 <dave at tiredofit dot ca>
 
    ### Reverted
diff --git a/Dockerfile b/Dockerfile
index 5354273..0b80798 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
 ARG DISTRO=alpine
-ARG DISTRO_VARIANT=3.18
+ARG DISTRO_VARIANT=edge
 
 FROM docker.io/tiredofit/nginx:${DISTRO}-${DISTRO_VARIANT}
 LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
 
 ARG PHP_BASE
 
-ENV PHP_BASE=${PHP_BASE:-"8.2"} \
+ENV PHP_BASE=${PHP_BASE:-"8.3"} \
     PHP_ENABLE_APCU=TRUE \
     PHP_ENABLE_BCMATH=TRUE \
     PHP_ENABLE_BZ2=TRUE \
@@ -94,19 +94,15 @@ RUN case "${PHP_BASE}" in \
                             php83-pecl-ast \
                             php83-pecl-couchbase \
                             php83-pecl-igbinary \
-                            php83-pecl-imagick \
-                            php83-pecl-lzf \
                             php83-pecl-maxminddb \
                             php83-pecl-memcache \
                             php83-pecl-memcached \
                             php83-pecl-mongodb \
                             php83-pecl-msgpack \
-                            php83-pecl-protobuf \
                             php83-pecl-psr \
                             php83-pecl-redis \
                             php83-pecl-swoole \
                             php83-pecl-uploadprogress \
-                            php83-pecl-uuid \
                             php83-pecl-xdebug \
                             php83-pecl-xhprof \
                             php83-pecl-xhprof-assets \
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 8e36248..d06b1b6 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -80,7 +80,6 @@ RUN export PHP_7_3_RUN_DEPS=" \
                 php$PHP_BASE-grpc \
                 php$PHP_BASE-imagick \
                 php$PHP_BASE-inotify \
-                php-lua \
                 php$PHP_BASE-lz4 \
                 php$PHP_BASE-mailparse \
                 php$PHP_BASE-maxminddb \
diff --git a/install/etc/cont-init.d/20-php-fpm b/install/etc/cont-init.d/20-php-fpm
index 582833e..6c420b2 100755
--- a/install/etc/cont-init.d/20-php-fpm
+++ b/install/etc/cont-init.d/20-php-fpm
@@ -30,7 +30,9 @@ case "${PHP_FPM_CONTAINER_MODE,,}" in
       ;;
       "php-fpm")
             print_warn "Setting Container to operate in PHP-FPM standalone mode - You will need a seperate container for Nginx or another webserver to serve content"
-            service_stop 10-nginx
+            set -x
+            mod_service_stop 10-nginx
+            set +x
             print_notice "Setting PHP-FPM to serve from ${PHP_WEBROOT}"
             sed -i "/[www]#/achdir = ${PHP_WEBROOT}" /assets/php-fpm/fpm/php-fpm.conf
             rm -rf /etc/zabbix/zabbix_agent.conf.d/nginx.conf