Merge pull request #12 from devilbox/release-0.9

Fix #11 bashrc-devilbox.d not been sourced

Author: cytopia

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