From 6f359ab3664053bf5f0709747ba66a26b9be3068 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 21 Nov 2020 14:40:05 +0100 Subject: [PATCH] Add .composer/vendir/bin to PATH variable --- CHANGELOG.md | 6 ++++++ Dockerfiles/work/Dockerfile-5.2 | 5 ++++- Dockerfiles/work/Dockerfile-5.3 | 5 ++++- Dockerfiles/work/Dockerfile-5.4 | 5 ++++- Dockerfiles/work/Dockerfile-5.5 | 5 ++++- Dockerfiles/work/Dockerfile-5.6 | 5 ++++- Dockerfiles/work/Dockerfile-7.0 | 5 ++++- Dockerfiles/work/Dockerfile-7.1 | 5 ++++- Dockerfiles/work/Dockerfile-7.2 | 5 ++++- Dockerfiles/work/Dockerfile-7.3 | 5 ++++- Dockerfiles/work/Dockerfile-7.4 | 5 ++++- Dockerfiles/work/Dockerfile-8.0 | 5 ++++- Dockerfiles/work/Dockerfile-8.1 | 5 ++++- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 5 ++++- 14 files changed, 58 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c8219e..a03370b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +## Release 0.117 + +#### Fixed +- [#755](https://github.com/cytopia/devilbox/issues/755) Add .composer/vendir/bin to PATH variable + + ## Release 0.116 #### Fixed diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index c7a459c..9fea367 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -411,7 +411,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index ea878a5..0dca27d 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -472,7 +472,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 9752b78..7b3ea3a 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -506,7 +506,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 1966161..148d2a0 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -524,7 +524,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 0d6b1f1..27c8bf6 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -535,7 +535,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 97d6af7..7588b84 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -535,7 +535,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 9e25bd0..f1c70ae 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -535,7 +535,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index d49a34f..741bfc3 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -536,7 +536,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 1e065a1..a6ee655 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -536,7 +536,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index c11f929..7036b03 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -531,7 +531,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 78570ab..b46b997 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -435,7 +435,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 1997ea8..f4f9012 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -435,7 +435,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index b3193be..8e6041b 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -428,7 +428,10 @@ RUN set -eux \ ### RUN \ { \ - echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \ + echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \ + echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \ + echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \ echo "export PATH"; \ echo ". /etc/bash-devilbox"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \