Merge pull request #13 from devilbox/release-0.10

Fix #10 WDSL via SOAP directory permissions

.travis.yml

@@ -95,7 +95,7 @@ before_script:
 ###
 script:
   - if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
-      docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}" &&
+      echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin &&
       if [ "${TRAVIS_BRANCH}" == "master" ]; then
         docker push "${IMAGE}:${PHP}-base";
         docker push "${IMAGE}:${PHP}-mods";

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
 
 
 ###

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
 
 
 ###

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
 
 
 ###

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
 
 
 ###

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
 
 
 ###

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
 
 
 ###

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
 }

Dockerfiles/work/Dockerfile-5.4

@@ -242,8 +242,8 @@ RUN \
 		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:/usr/local/node/bin"; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
-		echo "if [ -d /etc/bash-custom.d/ ]; then"; \
-		echo "    for f in /etc/bash-custom.d/*.sh ; do"; \
+		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
+		echo "    for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
 		echo "        if [ -r \"\${f}\" ]; then"; \
 		echo "            . \"\${f}\""; \
 		echo "        fi"; \
@@ -302,7 +302,7 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bash-custom.d
+VOLUME /etc/bashrc-devilbox.d
 VOLUME /etc/php-custom.d
 VOLUME /etc/php-fpm-custom.d
 VOLUME /etc/php-modules.d

Dockerfiles/work/Dockerfile-5.5

@@ -245,8 +245,8 @@ RUN \
 		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:/usr/local/node/bin"; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
-		echo "if [ -d /etc/bash-custom.d/ ]; then"; \
-		echo "    for f in /etc/bash-custom.d/*.sh ; do"; \
+		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
+		echo "    for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
 		echo "        if [ -r \"\${f}\" ]; then"; \
 		echo "            . \"\${f}\""; \
 		echo "        fi"; \
@@ -306,7 +306,7 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bash-custom.d
+VOLUME /etc/bashrc-devilbox.d
 VOLUME /etc/php-custom.d
 VOLUME /etc/php-fpm-custom.d
 VOLUME /etc/php-modules.d

Dockerfiles/work/Dockerfile-5.6

@@ -245,8 +245,8 @@ RUN \
 		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:/usr/local/node/bin"; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
-		echo "if [ -d /etc/bash-custom.d/ ]; then"; \
-		echo "    for f in /etc/bash-custom.d/*.sh ; do"; \
+		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
+		echo "    for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
 		echo "        if [ -r \"\${f}\" ]; then"; \
 		echo "            . \"\${f}\""; \
 		echo "        fi"; \
@@ -306,7 +306,7 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bash-custom.d
+VOLUME /etc/bashrc-devilbox.d
 VOLUME /etc/php-custom.d
 VOLUME /etc/php-fpm-custom.d
 VOLUME /etc/php-modules.d

Dockerfiles/work/Dockerfile-7.0

@@ -245,8 +245,8 @@ RUN \
 		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:/usr/local/node/bin"; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
-		echo "if [ -d /etc/bash-custom.d/ ]; then"; \
-		echo "    for f in /etc/bash-custom.d/*.sh ; do"; \
+		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
+		echo "    for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
 		echo "        if [ -r \"\${f}\" ]; then"; \
 		echo "            . \"\${f}\""; \
 		echo "        fi"; \
@@ -306,7 +306,7 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bash-custom.d
+VOLUME /etc/bashrc-devilbox.d
 VOLUME /etc/php-custom.d
 VOLUME /etc/php-fpm-custom.d
 VOLUME /etc/php-modules.d

Dockerfiles/work/Dockerfile-7.1

@@ -245,8 +245,8 @@ RUN \
 		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:/usr/local/node/bin"; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
-		echo "if [ -d /etc/bash-custom.d/ ]; then"; \
-		echo "    for f in /etc/bash-custom.d/*.sh ; do"; \
+		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
+		echo "    for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
 		echo "        if [ -r \"\${f}\" ]; then"; \
 		echo "            . \"\${f}\""; \
 		echo "        fi"; \
@@ -306,7 +306,7 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bash-custom.d
+VOLUME /etc/bashrc-devilbox.d
 VOLUME /etc/php-custom.d
 VOLUME /etc/php-fpm-custom.d
 VOLUME /etc/php-modules.d

Dockerfiles/work/Dockerfile-7.2

@@ -245,8 +245,8 @@ RUN \
 		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:/usr/local/node/bin"; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
-		echo "if [ -d /etc/bash-custom.d/ ]; then"; \
-		echo "    for f in /etc/bash-custom.d/*.sh ; do"; \
+		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
+		echo "    for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
 		echo "        if [ -r \"\${f}\" ]; then"; \
 		echo "            . \"\${f}\""; \
 		echo "        fi"; \
@@ -306,7 +306,7 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bash-custom.d
+VOLUME /etc/bashrc-devilbox.d
 VOLUME /etc/php-custom.d
 VOLUME /etc/php-fpm-custom.d
 VOLUME /etc/php-modules.d

README.md

@@ -128,7 +128,7 @@ Have a look at the following table to see all offered volumes for each Docker im
   </tr>
   <tr>
    <td rowspan="2"><strong>work</strong></td>
-   <td><code>/etc/bash-custom.d</code></td>
+   <td><code>/etc/bashrc-devilbox.d</code></td>
    <td>Mount this directory into your host computer and add custom configuration files for <code>bash</code> and other tools.</td>
   </tr>
   <tr>

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
 
 
 ###

build/ansible/DOCKERFILES/Dockerfile-work.j2

@@ -145,8 +145,8 @@ RUN \
 		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:/usr/local/node/bin"; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
-		echo "if [ -d /etc/bash-custom.d/ ]; then"; \
-		echo "    for f in /etc/bash-custom.d/*.sh ; do"; \
+		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
+		echo "    for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
 		echo "        if [ -r \"\${f}\" ]; then"; \
 		echo "            . \"\${f}\""; \
 		echo "        fi"; \
@@ -193,7 +193,7 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bash-custom.d
+VOLUME /etc/bashrc-devilbox.d
 VOLUME /etc/php-custom.d
 VOLUME /etc/php-fpm-custom.d
 VOLUME /etc/php-modules.d