From 2425dc7881f2d7610016f2a8919a76fa7062f7ed Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Tue, 31 Oct 2023 16:20:43 +0100
Subject: [PATCH] some cleaning

---
 Docker/{php-7.4-fpm => php-8.1-fpm}/Dockerfile          | 0
 Docker/{php-7.4-fpm => php-8.1-fpm}/bashrc              | 0
 Docker/{php-7.4-fpm => php-8.1-fpm}/inputrc             | 0
 Docker/{php-7.4-fpm => php-8.1-fpm}/php-custom.ini      | 0
 Docker/{php-7.4-fpm => php-8.1-fpm}/php-fpm-custom.conf | 0
 Docker/{php-7.4-fpm => php-8.1-fpm}/rsyslog-drupal.conf | 0
 Docker/{php-7.4-fpm => php-8.1-fpm}/rsyslog.service     | 0
 Makefile                                                | 6 ++++++
 docker-compose.yml                                      | 2 +-
 src_d9                                                  | 2 +-
 10 files changed, 8 insertions(+), 2 deletions(-)
 rename Docker/{php-7.4-fpm => php-8.1-fpm}/Dockerfile (100%)
 rename Docker/{php-7.4-fpm => php-8.1-fpm}/bashrc (100%)
 rename Docker/{php-7.4-fpm => php-8.1-fpm}/inputrc (100%)
 rename Docker/{php-7.4-fpm => php-8.1-fpm}/php-custom.ini (100%)
 rename Docker/{php-7.4-fpm => php-8.1-fpm}/php-fpm-custom.conf (100%)
 rename Docker/{php-7.4-fpm => php-8.1-fpm}/rsyslog-drupal.conf (100%)
 rename Docker/{php-7.4-fpm => php-8.1-fpm}/rsyslog.service (100%)

diff --git a/Docker/php-7.4-fpm/Dockerfile b/Docker/php-8.1-fpm/Dockerfile
similarity index 100%
rename from Docker/php-7.4-fpm/Dockerfile
rename to Docker/php-8.1-fpm/Dockerfile
diff --git a/Docker/php-7.4-fpm/bashrc b/Docker/php-8.1-fpm/bashrc
similarity index 100%
rename from Docker/php-7.4-fpm/bashrc
rename to Docker/php-8.1-fpm/bashrc
diff --git a/Docker/php-7.4-fpm/inputrc b/Docker/php-8.1-fpm/inputrc
similarity index 100%
rename from Docker/php-7.4-fpm/inputrc
rename to Docker/php-8.1-fpm/inputrc
diff --git a/Docker/php-7.4-fpm/php-custom.ini b/Docker/php-8.1-fpm/php-custom.ini
similarity index 100%
rename from Docker/php-7.4-fpm/php-custom.ini
rename to Docker/php-8.1-fpm/php-custom.ini
diff --git a/Docker/php-7.4-fpm/php-fpm-custom.conf b/Docker/php-8.1-fpm/php-fpm-custom.conf
similarity index 100%
rename from Docker/php-7.4-fpm/php-fpm-custom.conf
rename to Docker/php-8.1-fpm/php-fpm-custom.conf
diff --git a/Docker/php-7.4-fpm/rsyslog-drupal.conf b/Docker/php-8.1-fpm/rsyslog-drupal.conf
similarity index 100%
rename from Docker/php-7.4-fpm/rsyslog-drupal.conf
rename to Docker/php-8.1-fpm/rsyslog-drupal.conf
diff --git a/Docker/php-7.4-fpm/rsyslog.service b/Docker/php-8.1-fpm/rsyslog.service
similarity index 100%
rename from Docker/php-7.4-fpm/rsyslog.service
rename to Docker/php-8.1-fpm/rsyslog.service
diff --git a/Makefile b/Makefile
index 3d70c2e..0363975 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,12 @@ build:
 buildnc:
 		docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME)
 
+buildnc_php_d9:
+		docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) php_d9
+
+buildncnginx:
+		docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) nginx
+
 downbuildup: down build up
 
 up:
diff --git a/docker-compose.yml b/docker-compose.yml
index c3db7ab..ee91ed2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -53,7 +53,7 @@ services:
       - redis
 
   php_d9:
-    build: ./Docker/php-7.4-fpm/
+    build: ./Docker/php-8.1-fpm/
     user: ${USER_UID}:${USER_GID}
     volumes:
       - php-d9-user-data:/home/${USER_UNAME}
diff --git a/src_d9 b/src_d9
index 80cc9ae..17b25a6 160000
--- a/src_d9
+++ b/src_d9
@@ -1 +1 @@
-Subproject commit 80cc9ae097c01a751a1b81172f2114bf3181019d
+Subproject commit 17b25a6c3330e55bf0d03f41e2d7703b217628c5