diff --git a/.ansible/DOCKERFILES/Dockerfile-slim.j2 b/.ansible/DOCKERFILES/Dockerfile-slim.j2 index 41de42c..1901fdd 100644 --- a/.ansible/DOCKERFILES/Dockerfile-slim.j2 +++ b/.ansible/DOCKERFILES/Dockerfile-slim.j2 @@ -387,9 +387,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/.ansible/DOCKERFILES/Dockerfile-work.j2 b/.ansible/DOCKERFILES/Dockerfile-work.j2 index 8aba7fa..008259f 100644 --- a/.ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/.ansible/DOCKERFILES/Dockerfile-work.j2 @@ -87,28 +87,6 @@ RUN set -eux \ {%- endif -%} {%- endfor %} -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="{{ nvm_home }}/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -161,6 +139,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="{{ nvm_home }}/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="{{ nvm_home }}"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## diff --git a/.ansible/group_vars/all/work-help.yml b/.ansible/group_vars/all/work-help.yml index c732035..c96984d 100644 --- a/.ansible/group_vars/all/work-help.yml +++ b/.ansible/group_vars/all/work-help.yml @@ -117,12 +117,6 @@ help_software_available: && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="{{ nvm_home }}" bash \ \ - && { \ - echo 'export NVM_DIR="{{ nvm_home }}"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "{{ nvm_home }}" \ # Install latest and LTS version and yarn post: | diff --git a/.ansible/group_vars/all/work.yml b/.ansible/group_vars/all/work.yml index bd5b439..133826a 100644 --- a/.ansible/group_vars/all/work.yml +++ b/.ansible/group_vars/all/work.yml @@ -37,6 +37,7 @@ tools_enabled: - stylelint - svn - symfony-cli + - taskfile - tig - vim - vue-cli @@ -571,6 +572,12 @@ tools_available: command: curl -sS https://get.symfony.com/cli/installer | bash -s -- --install-dir /usr/local/bin build_dep: [] run_dep: [] + taskfile: + disabled: [] + check: task --version | grep -E '[0-9][.0-9]+' || (task --version; false) + all: + type: custom + command: sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ tig: disabled: [] check: tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) diff --git a/Dockerfiles/slim/Dockerfile-5.2 b/Dockerfiles/slim/Dockerfile-5.2 index e6c8a75..887c3ed 100644 --- a/Dockerfiles/slim/Dockerfile-5.2 +++ b/Dockerfiles/slim/Dockerfile-5.2 @@ -422,9 +422,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-5.3 b/Dockerfiles/slim/Dockerfile-5.3 index e54a8b0..e9df782 100644 --- a/Dockerfiles/slim/Dockerfile-5.3 +++ b/Dockerfiles/slim/Dockerfile-5.3 @@ -422,9 +422,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-5.4 b/Dockerfiles/slim/Dockerfile-5.4 index 7bd66bc..8913019 100644 --- a/Dockerfiles/slim/Dockerfile-5.4 +++ b/Dockerfiles/slim/Dockerfile-5.4 @@ -422,9 +422,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-5.5 b/Dockerfiles/slim/Dockerfile-5.5 index 366828b..8e14e52 100644 --- a/Dockerfiles/slim/Dockerfile-5.5 +++ b/Dockerfiles/slim/Dockerfile-5.5 @@ -422,9 +422,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-5.6 b/Dockerfiles/slim/Dockerfile-5.6 index aa16bde..aae0f5d 100644 --- a/Dockerfiles/slim/Dockerfile-5.6 +++ b/Dockerfiles/slim/Dockerfile-5.6 @@ -426,9 +426,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-7.0 b/Dockerfiles/slim/Dockerfile-7.0 index f0ac024..456ebfb 100644 --- a/Dockerfiles/slim/Dockerfile-7.0 +++ b/Dockerfiles/slim/Dockerfile-7.0 @@ -426,9 +426,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-7.1 b/Dockerfiles/slim/Dockerfile-7.1 index 17c71d3..bc7817b 100644 --- a/Dockerfiles/slim/Dockerfile-7.1 +++ b/Dockerfiles/slim/Dockerfile-7.1 @@ -420,9 +420,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-7.2 b/Dockerfiles/slim/Dockerfile-7.2 index fd89cd7..f5e4ed5 100644 --- a/Dockerfiles/slim/Dockerfile-7.2 +++ b/Dockerfiles/slim/Dockerfile-7.2 @@ -420,9 +420,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-7.3 b/Dockerfiles/slim/Dockerfile-7.3 index 3251e60..1e0155f 100644 --- a/Dockerfiles/slim/Dockerfile-7.3 +++ b/Dockerfiles/slim/Dockerfile-7.3 @@ -420,9 +420,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-7.4 b/Dockerfiles/slim/Dockerfile-7.4 index c0e864a..40cb9c2 100644 --- a/Dockerfiles/slim/Dockerfile-7.4 +++ b/Dockerfiles/slim/Dockerfile-7.4 @@ -420,9 +420,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-8.0 b/Dockerfiles/slim/Dockerfile-8.0 index 8ffc42c..0d927ce 100644 --- a/Dockerfiles/slim/Dockerfile-8.0 +++ b/Dockerfiles/slim/Dockerfile-8.0 @@ -420,9 +420,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-8.1 b/Dockerfiles/slim/Dockerfile-8.1 index 0f8addc..ff8738b 100644 --- a/Dockerfiles/slim/Dockerfile-8.1 +++ b/Dockerfiles/slim/Dockerfile-8.1 @@ -420,9 +420,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/slim/Dockerfile-8.2 b/Dockerfiles/slim/Dockerfile-8.2 index b91e6da..fd71d00 100644 --- a/Dockerfiles/slim/Dockerfile-8.2 +++ b/Dockerfiles/slim/Dockerfile-8.2 @@ -420,9 +420,15 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox ### RUN set -eux \ && { \ + echo; \ + echo "# [Devilbox] Ensure /usr/local(s)?bin is in PATH"; \ echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Source Devilbox main bash config"; \ echo ". /etc/bash-devilbox"; \ + echo; \ + echo "# [Devilbox] Source Devilbox custom configs"; \ echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \ echo " for f in /etc/bashrc-devilbox.d/*.sh ; do"; \ echo " if [ -r \"\${f}\" ]; then"; \ diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index eb714e6..aaa6951 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -42,12 +42,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -91,28 +85,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -145,6 +117,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -427,6 +431,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -689,6 +699,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 0661f04..fdc0339 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -63,12 +63,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -112,28 +106,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -174,6 +146,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -490,6 +494,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -775,6 +785,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 552c425..1663791 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -63,12 +63,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -112,28 +106,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -174,6 +146,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -513,6 +517,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -813,6 +823,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 654c3cb..6b346bb 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -63,12 +63,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -112,28 +106,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -174,6 +146,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -568,6 +572,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -900,6 +910,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index f61483d..ee00b61 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -63,12 +63,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -112,28 +106,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -174,6 +146,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -576,6 +580,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -933,6 +943,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index a178c77..81eb367 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -63,12 +63,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -112,28 +106,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -174,6 +146,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -576,6 +580,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -933,6 +943,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 40d2e9a..c2b8d06 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -63,12 +63,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -112,28 +106,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -174,6 +146,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -576,6 +580,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -933,6 +943,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 1a4cbd1..0573cb7 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -63,12 +63,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -112,28 +106,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -174,6 +146,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -576,6 +580,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -933,6 +943,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index bc6c504..f9da98c 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -64,12 +64,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -113,28 +107,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -176,6 +148,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -576,6 +580,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -933,6 +943,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index b87f08f..3bc68e6 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -64,12 +64,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -113,28 +107,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -176,6 +148,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -576,6 +580,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -933,6 +943,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index d763e48..f0f070b 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -64,12 +64,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -113,28 +107,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -176,6 +148,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -576,6 +580,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -933,6 +943,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index da5ef1e..94a2038 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -64,12 +64,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -113,28 +107,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -176,6 +148,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -576,6 +580,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -933,6 +943,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index f9f1bec..5d7557b 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -64,12 +64,6 @@ RUN set -eux \ && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ - && { \ - echo 'export NVM_DIR="/opt/nvm"'; \ - echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ - echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ - } >> /home/devilbox/.bashrc \ - \ && chown -R devilbox:devilbox "/opt/nvm" \ \ && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ @@ -113,28 +107,6 @@ RUN set -eux \ \ && true -### -### Configure Bash (composer, node yarn) -### -RUN set -eux \ - && { \ - echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ - echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ - echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ - echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \ - echo "export PATH"; \ - echo ". /etc/bash-devilbox"; \ - 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"; \ - echo " done"; \ - echo " unset f"; \ - echo "fi"; \ - } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ - && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc - ######################################################################################################################## @@ -176,6 +148,38 @@ COPY --from=devilbox-work-help-builder /usr/local/bin /usr/local/bin COPY --from=devilbox-work-help-builder /usr/local/lib /usr/local/lib +### +### Configure Bash (composer, node yarn) +### +RUN set -eux \ + && { \ + #echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \ + echo; \ + echo "# [Devilbox] Ensure yarn, composer and node are in PATH"; \ + echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \ + echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \ + echo 'PATH="/opt/nvm/versions/node/$(node --version)/bin:${PATH}"'; \ + echo "export PATH"; \ + echo; \ + echo "# [Devilbox] Ensure to load nvm"; \ + echo 'export NVM_DIR="/opt/nvm"'; \ + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm'; \ + echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion'; \ + #echo; \ + #echo ". /etc/bash-devilbox"; \ + #echo; \ + #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"; \ + #echo " done"; \ + #echo " unset f"; \ + #echo "fi"; \ + } | tee -a /home/${MY_USER}/.bashrc /root/.bashrc \ + && chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/.bashrc + + ######################################################################################################################## ######################################################################################################################## @@ -529,6 +533,12 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && sh -c "$(curl -sS -K --fail -k https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin/ \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ @@ -859,6 +869,11 @@ RUN set -eux \ && symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false) \ && true +# -------------------- (custom) taskfile -------------------- +RUN set -eux \ + && task --version | grep -E '[0-9][.0-9]+' || (task --version; false) \ + && true + # -------------------- (apt) tig -------------------- RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \