Merge pull request #117 from local-deploy/DL-T-79

feat(project): replacing php.ini variables in a container
local-deploy · Jan 25, 2024 · 56e5936 · 56e5936
2 parents 90d74bd + 7e37b46
commit 56e5936
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/command/up.go b/command/up.go
@@ -65,7 +65,7 @@ func upRun() {
 
 	bin, option := helper.GetCompose()
 	Args := []string{bin}
-	preArgs := []string{"-p", project.Env.GetString("NETWORK_NAME"), "up", "-d"}
+	preArgs := []string{"-p", project.Env.GetString("NETWORK_NAME"), "--project-directory", project.Env.GetString("PWD"), "up", "-d"}
 
 	if len(option) > 0 {
 		Args = append(Args, option)

diff --git a/config-files/docker-compose-apache.yaml b/config-files/docker-compose-apache.yaml
@@ -3,7 +3,7 @@ version: "3.8"
 services:
   php:
     container_name: ${HOST_NAME}_php
-    image: ${REPO}/local-deploy/php${PHP_VERSION:-7.4-apache}:${PHP_IMAGE_VERSION:-latest}
+    image: ${REPO}/local-deploy/php${PHP_VERSION:-8.2-apache}:${PHP_IMAGE_VERSION:-latest}
     environment:
       - "DOCUMENT_ROOT=${DOCUMENT_ROOT:-/var/www/html}"
       - "HOST_NAME=${HOST_NAME:-localhost}"
@@ -18,9 +18,11 @@ services:
       - "XDEBUG_PORT=${XDEBUG_PORT:-9003}"
       - "VIRTUAL_HOST=${HOST_NAME:-localhost}"
       - "PHP_MODULES=${PHP_MODULES:-opcache}"
+      - "PHP_INI_SCAN_DIR=/usr/local/etc/php/conf.d:/usr/local/etc/php/conf.custom.d"
       - "ENVIRONMENT=dl"
     volumes:
       - "${PWD}/:/var/www/html/"
+      - "${PHP_INI_SOURCE:-/dev/null}:/usr/local/etc/php/conf.custom.d/custom.ini:ro"
       - "~/.ssh/${SSH_KEY:-id_rsa}:/var/www/.ssh/id_rsa:ro"
       - "~/.ssh/known_hosts:/var/www/.ssh/known_hosts"
     labels:

diff --git a/config-files/docker-compose-fpm.yaml b/config-files/docker-compose-fpm.yaml
@@ -3,7 +3,7 @@ version: "3.8"
 services:
   php:
     container_name: ${HOST_NAME}_php
-    image: ${REPO}/local-deploy/php${PHP_VERSION:-7.4-fpm}:${PHP_IMAGE_VERSION:-latest}
+    image: ${REPO}/local-deploy/php${PHP_VERSION:-8.2-fpm}:${PHP_IMAGE_VERSION:-latest}
     environment:
       - "DOCUMENT_ROOT=${DOCUMENT_ROOT:-/var/www/html}"
       - "HOST_NAME=${HOST_NAME:-localhost}"
@@ -18,9 +18,11 @@ services:
       - "XDEBUG_PORT=${XDEBUG_PORT:-9003}"
       - "VIRTUAL_HOST=${HOST_NAME:-localhost}"
       - "PHP_MODULES=${PHP_MODULES:-opcache}"
+      - "PHP_INI_SCAN_DIR=/usr/local/etc/php/conf.d:/usr/local/etc/php/conf.custom.d"
       - "ENVIRONMENT=dl"
     volumes:
       - "${PWD}/:/var/www/html/"
+      - "${PHP_INI_SOURCE:-/dev/null}:/usr/local/etc/php/conf.custom.d/custom.ini:ro"
       - "~/.ssh/${SSH_KEY:-id_rsa}:/var/www/.ssh/id_rsa:ro"
       - "~/.ssh/known_hosts:/var/www/.ssh/known_hosts"
     networks: