From ec9749c95998d1c2b5dca69600c47effab8b3a0c Mon Sep 17 00:00:00 2001
From: chao sun <chao.sun@panubo.com>
Date: Fri, 12 Jan 2024 14:28:52 +1100
Subject: [PATCH] Move s6 into main package

---
 debian12/Dockerfile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian12/Dockerfile b/debian12/Dockerfile
index 64011a4..1ddee16 100644
--- a/debian12/Dockerfile
+++ b/debian12/Dockerfile
@@ -55,12 +55,6 @@ RUN set -x \
   && rm -f /tmp/* \
   ;
 
-# Install s6
-RUN set -x \
-  && apt-get update \
-  && apt-get install -y --no-install-recommends s6 \
-  ;
-
 # Install PHP Extras
 RUN set -x \
   && if ! command -v wget > /dev/null; then \
@@ -84,7 +78,7 @@ RUN set -x \
 RUN \
   export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
-  apt-get install --no-install-recommends --no-install-suggests -y wget curl ca-certificates git gnupg openssh-client msmtp-mta apache2 libapache2-mod-xsendfile imagemagick ghostscript \
+  apt-get install --no-install-recommends --no-install-suggests -y wget curl ca-certificates git gnupg openssh-client msmtp-mta apache2 libapache2-mod-xsendfile imagemagick ghostscript s6 \
   php8.2-apcu \
   php8.2-cli \
   php8.2-curl \