Merge remote-tracking branch 'magenius-team/fixed-history-folder-perm…

…issions' into develop
wardenenv · Feb 23, 2021 · 4c7967e · 4c7967e
2 parents 9801c9a + 7180e68
commit 4c7967e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/commands/env.cmd b/commands/env.cmd
@@ -27,7 +27,11 @@ if [[ ${WARDEN_ENV_TYPE} != local ]]; then
     WARDEN_NGINX=${WARDEN_NGINX:-1}
     WARDEN_DB=${WARDEN_DB:-1}
     WARDEN_REDIS=${WARDEN_REDIS:-1}
+
+    # define bash history folder for changing permissions
+    WARDEN_CHOWN_DIR_LIST="/bash_history ${WARDEN_CHOWN_DIR_LIST:-}"
 fi
+export CHOWN_DIR_LIST=${WARDEN_CHOWN_DIR_LIST:-}
 
 if [[ ${WARDEN_ENV_TYPE} == "magento1" && -f "${WARDEN_ENV_PATH}/.modman/.basedir" ]]; then
   export NGINX_PUBLIC='/'$(cat "${WARDEN_ENV_PATH}/.modman/.basedir")

diff --git a/environments/includes/php-fpm.base.yml b/environments/includes/php-fpm.base.yml
@@ -4,7 +4,7 @@ x-volumes: &volumes
   - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
   - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:cached
   - .${WARDEN_WEB_ROOT:-}/:/var/www/html:cached
-  - bashhistory:/var/bash_history
+  - bashhistory:/bash_history
 
 x-extra_hosts: &extra_hosts
     - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
@@ -25,7 +25,8 @@ services:
       - NODE_VERSION=${NODE_VERSION:-10}
       - COMPOSER_VERSION=${COMPOSER_VERSION:-1}
       - COMPOSER_MEMORY_LIMIT=-1
-      - HISTFILE=/var/bash_history/.bash_history
+      - HISTFILE=/bash_history/.bash_history
+      - CHOWN_DIR_LIST=${CHOWN_DIR_LIST:-}
     volumes: *volumes
     extra_hosts: *extra_hosts
 
@@ -40,7 +41,8 @@ services:
       - COMPOSER_VERSION=${COMPOSER_VERSION:-1}
       - COMPOSER_MEMORY_LIMIT=-1
       - PHP_IDE_CONFIG=serverName=${WARDEN_ENV_NAME}-docker
-      - HISTFILE=/var/bash_history/.bash_history
+      - HISTFILE=/bash_history/.bash_history
+      - CHOWN_DIR_LIST=${CHOWN_DIR_LIST:-}
     volumes: *volumes
     extra_hosts: *extra_hosts
     depends_on:

diff --git a/environments/magento1/magento1.blackfire.darwin.yml b/environments/magento1/magento1.blackfire.darwin.yml
@@ -5,7 +5,7 @@ x-volumes: &volumes
   - appdata:/var/www/html
 
 x-environment: &environment
-  - CHOWN_DIR_LIST=media
+  - CHOWN_DIR_LIST=media ${CHOWN_DIR_LIST:-}
 
 services:
   php-blackfire: { volumes: *volumes, environment: *environment }
diff --git a/environments/magento1/magento1.darwin.yml b/environments/magento1/magento1.darwin.yml
@@ -5,7 +5,7 @@ x-volumes: &volumes
   - appdata:/var/www/html
 
 x-environment: &environment
-  - CHOWN_DIR_LIST=media
+  - CHOWN_DIR_LIST=media ${CHOWN_DIR_LIST:-}
 
 services:
   nginx: { volumes: *volumes }

diff --git a/environments/magento2/magento2.blackfire.darwin.yml b/environments/magento2/magento2.blackfire.darwin.yml
@@ -5,7 +5,7 @@ x-volumes: &volumes
   - appdata:/var/www/html
 
 x-environment: &environment
-  - CHOWN_DIR_LIST=pub/media
+  - CHOWN_DIR_LIST=pub/media ${CHOWN_DIR_LIST:-}
 
 services:
   php-blackfire: { volumes: *volumes, environment: *environment }
diff --git a/environments/magento2/magento2.darwin.yml b/environments/magento2/magento2.darwin.yml
@@ -5,7 +5,7 @@ x-volumes: &volumes
   - appdata:/var/www/html
 
 x-environment: &environment
-  - CHOWN_DIR_LIST=pub/media
+  - CHOWN_DIR_LIST=pub/media ${CHOWN_DIR_LIST:-}
 
 services:
   nginx: { volumes: *volumes }

diff --git a/environments/shopware/shopware.darwin.yml b/environments/shopware/shopware.darwin.yml
@@ -5,7 +5,7 @@ x-volumes: &volumes
   - appdata:/var/www/html
 
 x-environment: &environment
-  - CHOWN_DIR_LIST=public/media
+  - CHOWN_DIR_LIST=public/media ${CHOWN_DIR_LIST:-}
 
 services:
   nginx: { volumes: *volumes }