From ce8388da44cc81d37fbe48ab79597101249a7dce Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 19 Jan 2023 20:49:18 -0600
Subject: [PATCH] Use init-nginx-end dependency Remove baseimage packages

---
 Dockerfile                                                     | 3 +--
 Dockerfile.aarch64                                             | 3 +--
 Dockerfile.armhf                                               | 3 +--
 .../dependencies.d/{init-config => init-nginx-end}             | 0
 root/etc/s6-overlay/s6-rc.d/init-grav-config/run               | 1 +
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename root/etc/s6-overlay/s6-rc.d/init-grav-config/dependencies.d/{init-config => init-nginx-end} (100%)

diff --git a/Dockerfile b/Dockerfile
index b276993..7f087b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,8 +30,7 @@ RUN \
     php81-simplexml \
     php81-tokenizer \
     php81-xml \
-    php81-zip \
-    unzip && \
+    php81-zip && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
   grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 403b6cb..3d85d55 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -30,8 +30,7 @@ RUN \
     php81-simplexml \
     php81-tokenizer \
     php81-xml \
-    php81-zip \
-    unzip && \
+    php81-zip && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
   grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 35ccc42..d3ff48c 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -30,8 +30,7 @@ RUN \
     php81-simplexml \
     php81-tokenizer \
     php81-xml \
-    php81-zip \
-    unzip && \
+    php81-zip && \
   echo "**** configure php-fpm to pass env vars ****" && \
   sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
   grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
diff --git a/root/etc/s6-overlay/s6-rc.d/init-grav-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-grav-config/dependencies.d/init-nginx-end
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/init-grav-config/dependencies.d/init-config
rename to root/etc/s6-overlay/s6-rc.d/init-grav-config/dependencies.d/init-nginx-end
diff --git a/root/etc/s6-overlay/s6-rc.d/init-grav-config/run b/root/etc/s6-overlay/s6-rc.d/init-grav-config/run
index 40e37a3..081a824 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-grav-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-grav-config/run
@@ -25,6 +25,7 @@ shopt -u globstar dotglob
 
 sed -i 's/enable_auto_updates_check: true/enable_auto_updates_check: false/' /config/www/user/plugins/admin/admin.yaml
 
+# permissions
 lsiown -R abc:abc \
     /app \
     /config/www