Browse Source

some cleaning

bach 5 months ago
parent
commit
2425dc7881

+ 0 - 0
Docker/php-7.4-fpm/Dockerfile → Docker/php-8.1-fpm/Dockerfile


+ 0 - 0
Docker/php-7.4-fpm/bashrc → Docker/php-8.1-fpm/bashrc


+ 0 - 0
Docker/php-7.4-fpm/inputrc → Docker/php-8.1-fpm/inputrc


+ 0 - 0
Docker/php-7.4-fpm/php-custom.ini → Docker/php-8.1-fpm/php-custom.ini


+ 0 - 0
Docker/php-7.4-fpm/php-fpm-custom.conf → Docker/php-8.1-fpm/php-fpm-custom.conf


+ 0 - 0
Docker/php-7.4-fpm/rsyslog-drupal.conf → Docker/php-8.1-fpm/rsyslog-drupal.conf


+ 0 - 0
Docker/php-7.4-fpm/rsyslog.service → Docker/php-8.1-fpm/rsyslog.service


+ 6 - 0
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:

+ 1 - 1
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}

+ 1 - 1
src_d9

@@ -1 +1 @@
-Subproject commit 80cc9ae097c01a751a1b81172f2114bf3181019d
+Subproject commit 17b25a6c3330e55bf0d03f41e2d7703b217628c5