From ea54b12e591bc6962411d599892ddf6d532010b3 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Sun, 29 Dec 2024 11:46:47 +0100
Subject: [PATCH] add supervisor to nineapache

---
 .gitignore                                            |  2 +-
 .../nineapache74/containers/nineapache/Dockerfile     |  5 ++++-
 misc/images/nineapache74/docker-compose.yml           | 11 +++++++++++
 .../nineapache81/containers/nineapache/Dockerfile     |  5 ++++-
 misc/images/nineapache81/docker-compose.yml           | 11 +++++++++++
 .../nineapache82/containers/nineapache/Dockerfile     |  5 ++++-
 misc/images/nineapache82/docker-compose.yml           | 11 +++++++++++
 7 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100755 misc/images/nineapache74/docker-compose.yml
 create mode 100755 misc/images/nineapache81/docker-compose.yml
 create mode 100755 misc/images/nineapache82/docker-compose.yml

diff --git a/.gitignore b/.gitignore
index 4e5e77d..c3d195d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 **/.env.local
 **/.env.merge
 
-docker-compose.yml
+/docker-compose.yml
 
 /services/10-nineapache/volume
 
diff --git a/misc/images/nineapache74/containers/nineapache/Dockerfile b/misc/images/nineapache74/containers/nineapache/Dockerfile
index dbfeb9f..c818271 100755
--- a/misc/images/nineapache74/containers/nineapache/Dockerfile
+++ b/misc/images/nineapache74/containers/nineapache/Dockerfile
@@ -13,7 +13,8 @@ RUN apk add --no-cache \
     unzip \
     zip \
     openssl \
-    mariadb-client
+    mariadb-client \
+    supervisor
 
 RUN apk add --no-cache \ 
     apache2 \
@@ -58,6 +59,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/l
 RUN npm install -g n
 RUN npm install -g yarn
 
+RUN mkdir /etc/supervisor.d
+
 COPY apache2.sh /etc/apache2/apache2.sh
 RUN chmod +x /etc/apache2/apache2.sh    
 COPY php.local.ini /etc/php7/conf.d/
diff --git a/misc/images/nineapache74/docker-compose.yml b/misc/images/nineapache74/docker-compose.yml
new file mode 100755
index 0000000..b87697d
--- /dev/null
+++ b/misc/images/nineapache74/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3'
+
+services:
+  nineapache74:
+    build:
+      context: ./containers/nineapache
+    image: reg.cadoles.com/envole/nineapache74
+    container_name: nineapache74  
+    ports:
+      - "8080:80"  
+      - "8443:443"      
\ No newline at end of file
diff --git a/misc/images/nineapache81/containers/nineapache/Dockerfile b/misc/images/nineapache81/containers/nineapache/Dockerfile
index 1a031a7..9fd87de 100755
--- a/misc/images/nineapache81/containers/nineapache/Dockerfile
+++ b/misc/images/nineapache81/containers/nineapache/Dockerfile
@@ -15,7 +15,8 @@ RUN apk add --no-cache \
     openssl \
     mariadb-client \
     certbot \
-    gettext
+    gettext \
+    supervisor
 
 RUN apk add --no-cache \ 
     apache2 \
@@ -61,6 +62,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 RUN npm install -g n
 RUN npm install -g yarn
 
+RUN mkdir /etc/supervisor.d
+
 COPY apache2.sh /etc/apache2/apache2.sh
 RUN chmod +x /etc/apache2/apache2.sh  
 COPY php.local.ini /etc/php81/conf.d/
diff --git a/misc/images/nineapache81/docker-compose.yml b/misc/images/nineapache81/docker-compose.yml
new file mode 100755
index 0000000..5e5db12
--- /dev/null
+++ b/misc/images/nineapache81/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3'
+
+services:
+  nineapache81:
+    build:
+      context: ./containers/nineapache
+    image: reg.cadoles.com/envole/nineapache81
+    container_name: nineapache81
+    ports:
+      - "8080:80"  
+      - "8443:443"      
\ No newline at end of file
diff --git a/misc/images/nineapache82/containers/nineapache/Dockerfile b/misc/images/nineapache82/containers/nineapache/Dockerfile
index 344a06d..a580ed3 100755
--- a/misc/images/nineapache82/containers/nineapache/Dockerfile
+++ b/misc/images/nineapache82/containers/nineapache/Dockerfile
@@ -15,7 +15,8 @@ RUN apk add --no-cache \
     unzip \
     zip \
     openssl \
-    mariadb-client
+    mariadb-client \
+    supervisor
 
 RUN apk add --no-cache \ 
     apache2 \
@@ -64,6 +65,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 RUN npm install -g n
 RUN npm install -g yarn
 
+RUN mkdir /etc/supervisor.d
+
 COPY apache2.sh /etc/apache2/apache2.sh
 RUN chmod +x /etc/apache2/apache2.sh  
 COPY php.local.ini /etc/php82/conf.d/
diff --git a/misc/images/nineapache82/docker-compose.yml b/misc/images/nineapache82/docker-compose.yml
new file mode 100755
index 0000000..cd9450d
--- /dev/null
+++ b/misc/images/nineapache82/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3'
+
+services:
+  nineapache82:
+    build:
+      context: ./containers/nineapache
+    image: reg.cadoles.com/envole/nineapache82
+    container_name: nineapache82
+    ports:
+      - "8080:80"  
+      - "8443:443"      
\ No newline at end of file