Merge pull request #13 from devilbox/release-0.10

Fix #10 WDSL via SOAP directory permissions
devilbox · Apr 21, 2018 · 48227f5 · 48227f5
2 parents 41ce375 + df2a62f
commit 48227f5
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 7 deletions.
diff --git a/Dockerfiles/base/Dockerfile-5.4 b/Dockerfiles/base/Dockerfile-5.4
@@ -46,7 +46,11 @@ RUN set -x \
 ###
 RUN set -x \
 	&& rm -rf /usr/local/etc/php-fpm.d \
-	&& mkdir -p /usr/local/etc/php-fpm.d
+	&& mkdir -p /usr/local/etc/php-fpm.d \
+	&& mkdir -p /var/lib/php/session \
+	&& mkdir -p /var/lib/php/wsdlcache \
+	&& chown -R devilbox:devilbox /var/lib/php/session \
+	&& chown -R devilbox:devilbox /var/lib/php/wsdlcache
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5
@@ -46,7 +46,11 @@ RUN set -x \
 ###
 RUN set -x \
 	&& rm -rf /usr/local/etc/php-fpm.d \
-	&& mkdir -p /usr/local/etc/php-fpm.d
+	&& mkdir -p /usr/local/etc/php-fpm.d \
+	&& mkdir -p /var/lib/php/session \
+	&& mkdir -p /var/lib/php/wsdlcache \
+	&& chown -R devilbox:devilbox /var/lib/php/session \
+	&& chown -R devilbox:devilbox /var/lib/php/wsdlcache
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-5.6 b/Dockerfiles/base/Dockerfile-5.6
@@ -46,7 +46,11 @@ RUN set -x \
 ###
 RUN set -x \
 	&& rm -rf /usr/local/etc/php-fpm.d \
-	&& mkdir -p /usr/local/etc/php-fpm.d
+	&& mkdir -p /usr/local/etc/php-fpm.d \
+	&& mkdir -p /var/lib/php/session \
+	&& mkdir -p /var/lib/php/wsdlcache \
+	&& chown -R devilbox:devilbox /var/lib/php/session \
+	&& chown -R devilbox:devilbox /var/lib/php/wsdlcache
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-7.0 b/Dockerfiles/base/Dockerfile-7.0
@@ -46,7 +46,11 @@ RUN set -x \
 ###
 RUN set -x \
 	&& rm -rf /usr/local/etc/php-fpm.d \
-	&& mkdir -p /usr/local/etc/php-fpm.d
+	&& mkdir -p /usr/local/etc/php-fpm.d \
+	&& mkdir -p /var/lib/php/session \
+	&& mkdir -p /var/lib/php/wsdlcache \
+	&& chown -R devilbox:devilbox /var/lib/php/session \
+	&& chown -R devilbox:devilbox /var/lib/php/wsdlcache
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-7.1 b/Dockerfiles/base/Dockerfile-7.1
@@ -46,7 +46,11 @@ RUN set -x \
 ###
 RUN set -x \
 	&& rm -rf /usr/local/etc/php-fpm.d \
-	&& mkdir -p /usr/local/etc/php-fpm.d
+	&& mkdir -p /usr/local/etc/php-fpm.d \
+	&& mkdir -p /var/lib/php/session \
+	&& mkdir -p /var/lib/php/wsdlcache \
+	&& chown -R devilbox:devilbox /var/lib/php/session \
+	&& chown -R devilbox:devilbox /var/lib/php/wsdlcache
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-7.2 b/Dockerfiles/base/Dockerfile-7.2
@@ -46,7 +46,11 @@ RUN set -x \
 ###
 RUN set -x \
 	&& rm -rf /usr/local/etc/php-fpm.d \
-	&& mkdir -p /usr/local/etc/php-fpm.d
+	&& mkdir -p /usr/local/etc/php-fpm.d \
+	&& mkdir -p /var/lib/php/session \
+	&& mkdir -p /var/lib/php/wsdlcache \
+	&& chown -R devilbox:devilbox /var/lib/php/session \
+	&& chown -R devilbox:devilbox /var/lib/php/wsdlcache
 
 
 ###

diff --git a/Dockerfiles/base/data/docker-entrypoint.d/01-uid-gid.sh b/Dockerfiles/base/data/docker-entrypoint.d/01-uid-gid.sh
@@ -62,6 +62,8 @@ set_uid() {
 			log "info" "Changing user '${username}' uid to: ${uid}" "${debug}"
 			run "usermod -u ${uid} ${username}" "${debug}"
 			run "chown -R ${username} ${homedir}" "${debug}"
+			run "chown -R ${username} /var/lib/php/session" "${debug}"
+			run "chown -R ${username} /var/lib/php/wsdlcache" "${debug}"
 		fi
 	fi
 }
@@ -102,6 +104,8 @@ set_gid() {
 			log "info" "Changing group '${groupname}' gid to: ${gid}" "${debug}"
 			run "groupmod -g ${gid} ${groupname}" "${debug}"
 			run "chown -R :${groupname} ${homedir}" "${debug}"
+			run "chown -R :${groupname} /var/lib/php/session" "${debug}"
+			run "chown -R :${groupname} /var/lib/php/wsdlcache" "${debug}"
 		fi
 	fi
 }

diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2
@@ -46,7 +46,11 @@ RUN set -x \
 ###
 RUN set -x \
 	&& rm -rf /usr/local/etc/php-fpm.d \
-	&& mkdir -p /usr/local/etc/php-fpm.d
+	&& mkdir -p /usr/local/etc/php-fpm.d \
+	&& mkdir -p /var/lib/php/session \
+	&& mkdir -p /var/lib/php/wsdlcache \
+	&& chown -R devilbox:devilbox /var/lib/php/session \
+	&& chown -R devilbox:devilbox /var/lib/php/wsdlcache
 
 
 ###