Merge pull request #12 from devilbox/release-0.9

Fix #11 bashrc-devilbox.d not been sourced

.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/data/php-fpm.d/pool.conf

@@ -1,8 +1,7 @@
 [www]
 
-; Pool config
 pm = dynamic
-pm.max_children = 5
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3
+pm.max_children = 20
+pm.start_servers = 10
+pm.min_spare_servers = 5
+pm.max_spare_servers = 10

Dockerfiles/prod/data/docker-entrypoint.d/36-custom-php-fpm-files.sh

@@ -27,7 +27,7 @@ copy_fpm_files() {
 	'
 	for fpm_f in ${fpm_files}; do
 		fpm_name="$( basename "${fpm_f}" )"
-		log "info" "PHP-FOM.conf: ${fpm_name} -> ${fpm_dst}/zzz-devilbox-${fpm_name}" "${debug}"
+		log "info" "PHP-FPM.conf: ${fpm_name} -> ${fpm_dst}/zzz-devilbox-${fpm_name}" "${debug}"
 		run "cp ${fpm_f} ${fpm_dst}/zzz-devilbox-${fpm_name}" "${debug}"
 	done
 	run "find ${fpm_dst} -type f -iname '*.conf' -exec chmod 0644 \"{}\" \;" "${debug}"

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"; \
@@ -292,6 +292,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
+COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
 COPY ./data/bash-devilbox /etc/bash-devilbox
@@ -301,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"; \
@@ -296,6 +296,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
+COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
 COPY ./data/bash-devilbox /etc/bash-devilbox
@@ -305,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"; \
@@ -296,6 +296,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
+COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
 COPY ./data/bash-devilbox /etc/bash-devilbox
@@ -305,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"; \
@@ -296,6 +296,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
+COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
 COPY ./data/bash-devilbox /etc/bash-devilbox
@@ -305,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"; \
@@ -296,6 +296,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
+COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
 COPY ./data/bash-devilbox /etc/bash-devilbox
@@ -305,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"; \
@@ -296,6 +296,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
+COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
 COPY ./data/bash-devilbox /etc/bash-devilbox
@@ -305,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/data/php.d/error-reporting.ini

@@ -0,0 +1,12 @@
+; PHP Development configuration for errors
+
+; Show all errors
+display_errors = On
+display_startup_errors = On
+
+; Log all errors
+log_errors = On
+
+; What errors to show/log
+error_reporting = E_ALL | E_STRICT
+xmlrpc_errors = On

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-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"; \
@@ -183,6 +183,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
+COPY ./data/php.d/error-reporting.ini /usr/local/etc/php/conf.d/devilbox-error-reporting.ini
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
 COPY ./data/bash-devilbox /etc/bash-devilbox
@@ -192,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