diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 756843b..aed8b2b 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -258,7 +258,20 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -298,27 +311,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -341,6 +335,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -396,6 +408,7 @@ RUN set -x \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ + \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 6a1d0e0..ce92e40 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -154,10 +154,6 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/awesome-ci \ \ -# codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ -&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ - \ # drush7 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \ && cd /usr/local/src/drush7 \ @@ -299,7 +295,25 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ +# codeception + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ + && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ +# prestissimo + && COMPOSER_HOME="/usr/local/src/composer" composer global require hirak/prestissimo \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -339,27 +353,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -382,6 +377,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -431,7 +444,6 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && git-flow version | grep -E '[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ @@ -444,6 +456,8 @@ RUN set -x \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ + \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 9409df5..e306ec8 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -154,10 +154,6 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/awesome-ci \ \ -# codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ -&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ - \ # deployer && curl -sS https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ @@ -328,7 +324,25 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ +# codeception + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ + && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ +# prestissimo + && COMPOSER_HOME="/usr/local/src/composer" composer global require hirak/prestissimo \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -368,27 +382,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -411,6 +406,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -460,7 +473,6 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ @@ -477,6 +489,8 @@ RUN set -x \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ + \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index dc23f20..bc6d601 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -145,10 +145,6 @@ RUN set -x \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \ \ -# asgardcms - && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ -&& ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/asgardcms \ - \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ @@ -158,10 +154,6 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/awesome-ci \ \ -# codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ -&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ - \ # deployer && curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ @@ -225,10 +217,6 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ -# lumen - && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ -&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ - \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -283,10 +271,6 @@ RUN set -x \ && curl -qL https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \ && chmod +x /usr/local/bin/phpunit \ \ -# photon - && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ - \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -343,7 +327,34 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ +# asgardcms + && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ + && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ +# codeception + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ + && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ + && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ +# photon + && COMPOSER_HOME="/usr/local/src/composer" composer global require photoncms/installer \ + && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ +# prestissimo + && COMPOSER_HOME="/usr/local/src/composer" composer global require hirak/prestissimo \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -383,27 +394,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -426,6 +418,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -468,7 +478,6 @@ RUN set -x \ RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ && scss-lint --version | grep -E '[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ @@ -476,7 +485,6 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ @@ -485,17 +493,20 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && photon --version | grep -E 'Installer [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ + \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ + && photon --version | grep -E 'Installer [.0-9]+' \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 432f238..e775683 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -144,10 +144,6 @@ RUN set -x \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \ \ -# asgardcms - && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ -&& ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/asgardcms \ - \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ @@ -157,10 +153,6 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/awesome-ci \ \ -# codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ -&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ - \ # deployer && curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ @@ -237,10 +229,6 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ -# lumen - && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ -&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ - \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -295,10 +283,6 @@ RUN set -x \ && curl -qL https://phar.phpunit.de/phpunit-5.phar > /usr/local/bin/phpunit 2>/dev/null \ && chmod +x /usr/local/bin/phpunit \ \ -# photon - && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ - \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -355,7 +339,34 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ +# asgardcms + && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ + && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ +# codeception + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ + && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ + && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ +# photon + && COMPOSER_HOME="/usr/local/src/composer" composer global require photoncms/installer \ + && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ +# prestissimo + && COMPOSER_HOME="/usr/local/src/composer" composer global require hirak/prestissimo \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -395,27 +406,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -438,6 +430,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -480,7 +490,6 @@ RUN set -x \ RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ && scss-lint --version | grep -E '[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ @@ -488,7 +497,6 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ @@ -498,17 +506,20 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && photon --version | grep -E 'Installer [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ + \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ + && photon --version | grep -E 'Installer [.0-9]+' \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 1182fc6..b1155ab 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -144,10 +144,6 @@ RUN set -x \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \ \ -# asgardcms - && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ -&& ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/asgardcms \ - \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ @@ -157,10 +153,6 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/awesome-ci \ \ -# codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ -&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ - \ # deployer && curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ @@ -237,10 +229,6 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ -# lumen - && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ -&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ - \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -295,10 +283,6 @@ RUN set -x \ && curl -qL https://phar.phpunit.de/phpunit-6.phar > /usr/local/bin/phpunit 2>/dev/null \ && chmod +x /usr/local/bin/phpunit \ \ -# photon - && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ - \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -355,7 +339,34 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ +# asgardcms + && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ + && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ +# codeception + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ + && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ + && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ +# photon + && COMPOSER_HOME="/usr/local/src/composer" composer global require photoncms/installer \ + && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ +# prestissimo + && COMPOSER_HOME="/usr/local/src/composer" composer global require hirak/prestissimo \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -395,27 +406,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -438,6 +430,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -480,7 +490,6 @@ RUN set -x \ RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ && scss-lint --version | grep -E '[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ @@ -488,7 +497,6 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ @@ -498,17 +506,20 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && photon --version | grep -E 'Installer [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ + \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ + && photon --version | grep -E 'Installer [.0-9]+' \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 43047bd..1795174 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -144,10 +144,6 @@ RUN set -x \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \ \ -# asgardcms - && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ -&& ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/asgardcms \ - \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ @@ -157,10 +153,6 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/awesome-ci \ \ -# codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ -&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ - \ # deployer && curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ @@ -237,10 +229,6 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ -# lumen - && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ -&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ - \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -295,10 +283,6 @@ RUN set -x \ && curl -qL https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \ && chmod +x /usr/local/bin/phpunit \ \ -# photon - && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ - \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -355,7 +339,34 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ +# asgardcms + && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ + && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ +# codeception + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ + && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ + && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ +# photon + && COMPOSER_HOME="/usr/local/src/composer" composer global require photoncms/installer \ + && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ +# prestissimo + && COMPOSER_HOME="/usr/local/src/composer" composer global require hirak/prestissimo \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -395,27 +406,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -438,6 +430,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -480,7 +490,6 @@ RUN set -x \ RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ && scss-lint --version | grep -E '[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ @@ -488,7 +497,6 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ @@ -498,17 +506,20 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && photon --version | grep -E 'Installer [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ + \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ + && photon --version | grep -E 'Installer [.0-9]+' \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 16285cd..83188c5 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -144,10 +144,6 @@ RUN set -x \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \ \ -# asgardcms - && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ -&& ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/asgardcms \ - \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ @@ -157,10 +153,6 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/awesome-ci \ \ -# codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ -&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ - \ # deployer && curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ @@ -237,10 +229,6 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ -# lumen - && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ -&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ - \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -295,10 +283,6 @@ RUN set -x \ && curl -qL https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \ && chmod +x /usr/local/bin/phpunit \ \ -# photon - && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ - \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -355,7 +339,34 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ +# asgardcms + && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ + && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ +# codeception + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ + && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ + && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ +# photon + && COMPOSER_HOME="/usr/local/src/composer" composer global require photoncms/installer \ + && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ +# prestissimo + && COMPOSER_HOME="/usr/local/src/composer" composer global require hirak/prestissimo \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -395,27 +406,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -438,6 +430,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -480,7 +490,6 @@ RUN set -x \ RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ && scss-lint --version | grep -E '[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ @@ -488,7 +497,6 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ @@ -498,17 +506,20 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && photon --version | grep -E 'Installer [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ + \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ + && photon --version | grep -E 'Installer [.0-9]+' \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index b2ab940..d2fedfa 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -144,10 +144,6 @@ RUN set -x \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \ \ -# asgardcms - && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ -&& ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/asgardcms \ - \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ @@ -157,10 +153,6 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/awesome-ci \ \ -# codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ -&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ - \ # deployer && curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ @@ -237,10 +229,6 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ -# lumen - && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ -&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ - \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -284,10 +272,6 @@ RUN set -x \ && curl -qL https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \ && chmod +x /usr/local/bin/phpunit \ \ -# photon - && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ - \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -344,7 +328,34 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ +# asgardcms + && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ + && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ +# codeception + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ + && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ + && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ +# photon + && COMPOSER_HOME="/usr/local/src/composer" composer global require photoncms/installer \ + && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ +# prestissimo + && COMPOSER_HOME="/usr/local/src/composer" composer global require hirak/prestissimo \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -384,27 +395,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -427,6 +419,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -469,7 +479,6 @@ RUN set -x \ RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ && scss-lint --version | grep -E '[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ @@ -477,7 +486,6 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ @@ -487,16 +495,19 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && photon --version | grep -E 'Installer [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ + \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ + && photon --version | grep -E 'Installer [.0-9]+' \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index c26385f..3b397c4 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -144,10 +144,6 @@ RUN set -x \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \ \ -# asgardcms - && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ -&& ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/asgardcms \ - \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ && cd /usr/local/src/awesome-ci \ @@ -157,10 +153,6 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/awesome-ci \ \ -# codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ -&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ - \ # deployer && curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ @@ -237,10 +229,6 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ -# lumen - && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ -&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ - \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -280,10 +268,6 @@ RUN set -x \ && curl -qL https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \ && chmod +x /usr/local/bin/phpunit \ \ -# photon - && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ - \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -340,7 +324,34 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ +# asgardcms + && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ + && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ +# codeception + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ + && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ + && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ +# photon + && COMPOSER_HOME="/usr/local/src/composer" composer global require photoncms/installer \ + && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ +# prestissimo + && COMPOSER_HOME="/usr/local/src/composer" composer global require hirak/prestissimo \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -380,27 +391,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -423,6 +415,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -465,7 +475,6 @@ RUN set -x \ RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ && scss-lint --version | grep -E '[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ @@ -473,7 +482,6 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ @@ -483,15 +491,18 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && photon --version | grep -E 'Installer [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ + \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ + && photon --version | grep -E 'Installer [.0-9]+' \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index cc13eb0..157fa03 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -271,7 +271,20 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ # angular_cli @@ -311,27 +324,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -# ansible - && pip install --no-cache-dir --force-reinstall ansible \ -# yamllint - && pip install --no-cache-dir --force-reinstall yamllint \ - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ # mixlib_config @@ -354,6 +348,24 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +# ansible + && pip install --no-cache-dir --force-reinstall ansible \ +# yamllint + && pip install --no-cache-dir --force-reinstall yamllint \ + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -414,6 +426,7 @@ RUN set -x \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ + \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index b51e104..cb5e968 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -182,7 +182,39 @@ RUN set -x \ ### -### Install Node npm packages (globally) +### Install Composer (PHP) +### +RUN set -x \ +{% for tool in composer_enabled %} +{# Not disabled #} +{% if ('disabled' not in composer_available[tool]) or (php_version not in composer_available[tool]['disabled']) %} +# {{ tool }} +{# Version specific gem version available? #} +{% if php_version in composer_available[tool] and 'version' in composer_available[tool][php_version] %} + && COMPOSER_HOME="{{ composer_home }}" composer global require {{ composer_available[tool]['name'] }}:{{ composer_available[tool][php_version]['version'] }} \ +{# Generic gem version available? #} +{% elif 'all' in composer_available[tool] and 'version' in composer_available[tool]['all'] %} + && COMPOSER_HOME="{{ composer_home }}" composer global require {{ composer_available[tool]['name'] }}:{{ composer_available[tool]['all']['version'] }} \ +{# No version info available #} +{% else %} + && COMPOSER_HOME="{{ composer_home }}" composer global require {{ composer_available[tool]['name'] }} \ +{% endif %} +{% if 'link' in composer_available[tool] %} + && ln -s {{ composer_home }}/vendor/{{ composer_available[tool]['name'] }}/{{ composer_available[tool]['link'] }} /usr/local/bin/ \ +{% endif %} +{% endif %} +{% endfor %} + \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + +### +### Install npm (Node) ### RUN set -x \ {% for tool in npm_enabled %} @@ -214,39 +246,8 @@ RUN set -x \ && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - ### -### Install Python pip packages -### -RUN set -x \ -{% for tool in pip_enabled %} -{# Not disabled #} -{% if ('disabled' not in pip_available[tool]) or (php_version not in pip_available[tool]['disabled']) %} -# {{ tool }} -{# Version specific gem version available? #} -{% if php_version in pip_available[tool] and 'version' in pip_available[tool][php_version] %} - && pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool][php_version]['version'] }} \ -{# Generic gem version available? #} -{% elif 'all' in pip_available[tool] and 'version' in pip_available[tool]['all'] %} - && pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool]['all']['version'] }} \ -{# No version info available #} -{% else %} - && pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }} \ -{% endif %} -{% endif %} -{% endfor %} - \ - && rm -rf /root/.cache/pip \ - && rm -rf /tmp/* \ - && (rm -rf /tmp/.* || true) \ - \ - && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ - && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) - - -### -### Install Ruby gems +### Install gem (Ruby) ### RUN set -x \ {% for tool in gem_enabled %} @@ -275,6 +276,36 @@ RUN set -x \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Install pip (Python) packages +### +RUN set -x \ +{% for tool in pip_enabled %} +{# Not disabled #} +{% if ('disabled' not in pip_available[tool]) or (php_version not in pip_available[tool]['disabled']) %} +# {{ tool }} +{# Version specific gem version available? #} +{% if php_version in pip_available[tool] and 'version' in pip_available[tool][php_version] %} + && pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool][php_version]['version'] }} \ +{# Generic gem version available? #} +{% elif 'all' in pip_available[tool] and 'version' in pip_available[tool]['all'] %} + && pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool]['all']['version'] }} \ +{# No version info available #} +{% else %} + && pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }} \ +{% endif %} +{% endif %} +{% endfor %} + \ + && rm -rf /root/.cache/pip \ + && rm -rf /tmp/* \ + && (rm -rf /tmp/.* || true) \ + \ + && (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \ + && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) + + ### ### Configure Bash ### @@ -325,6 +356,15 @@ RUN set -x \ {% endif %} {% endif %} {% endfor %} \ +{# ---- Composer ---- #} +{% for tool in composer_enabled %} +{# Not disabled #} +{% if ('disabled' not in composer_available[tool]) or (php_version not in composer_available[tool]['disabled']) %} +{% if 'check' in composer_available[tool] %} + && {{ composer_available[tool]['check'] }} \ +{% endif %} +{% endif %} +{% endfor %} \ {# ---- PIP ---- #} {% for tool in pip_enabled %} {# Not disabled #} diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index e4bf355..e20b9f6 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -11,7 +11,7 @@ # ------------------------------------------------------------------------------------------------- # Global variables # ------------------------------------------------------------------------------------------------- -compose_home: /usr/local/src/composer +composer_home: /usr/local/src/composer nvm_home: /usr/local/src/nvm @@ -27,6 +27,17 @@ apt_repositories_enabled: - yarn +# ------------------------------------------------------------------------------------------------- +# PHP Composer packages to install +# ------------------------------------------------------------------------------------------------- +composer_enabled: + - asgardcms + - codeception + - lumen + - photon + - prestissimo + + # ------------------------------------------------------------------------------------------------- # Ruby gem packages to install # ------------------------------------------------------------------------------------------------- @@ -74,9 +85,7 @@ software_enabled: - pip - nvm # Normal packages start here - - asgardcms - awesomeci - - codeception - deployer - drush7 - drush8 @@ -86,7 +95,6 @@ software_enabled: - laravel - linkcheck - linuxbrew - - lumen - mhsendmail - mysqldumpsecure - phalcon @@ -94,7 +102,6 @@ software_enabled: - phpcbf - php-cs-fixer - phpunit - - photon - symfony - wkhtmltopdf - wpcli @@ -182,29 +189,81 @@ apt_repositories_available: # ------------------------------------------------------------------------------------------------- -# Python pip definition +# Composer (PHP) definition # ------------------------------------------------------------------------------------------------- -# name: Name of the Python pip package +# name: Name of the PHP Composer package +# link: [optional] Name of the binary to symlink to /usr/local/bin # all: is generic version of defines # 7.2: is specific version of defines # disabled: [optional] Array of PHP versions for which to disable this module # check: [optional] Include a check command to test if it was installed successfully # # all, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4: -# version: [optional] Specific version of Python pip package +# version: [optional] Specific version of Ruby gem # -pip_available: - ansible: - name: ansible - check: ansible --version | grep -E '^ansible [.0-9]+$' - yamllint: - name: yamllint - check: yamllint --version 2>&1 | grep -E '[.0-9]+' +composer_available: + asgardcms: + disabled: [5.2, 5.3, 5.4, 8.0] + check: asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' + name: asgardcms/asgardcms-installer + link: asgardcms + codeception: + disabled: [5.2, 8.0] + check: codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' + name: codeception/codeception + link: codecept + lumen: + disabled: [5.2, 5.3, 5.4, 8.0] + check: lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' + name: laravel/lumen-installer + link: lumen + photon: + disabled: [5.2, 5.3, 5.4, 8.0] + check: photon --version | grep -E 'Installer [.0-9]+' + name: photoncms/installer + link: photon + prestissimo: + disabled: [5.2, 8.0] + name: hirak/prestissimo # ------------------------------------------------------------------------------------------------- -# Node npm definition +# Gems (Ruby) definition +# ------------------------------------------------------------------------------------------------- + +# name: Name of the Ruby gem package +# all: is generic version of defines +# 7.2: is specific version of defines +# disabled: [optional] Array of PHP versions for which to disable this module +# check: [optional] Include a check command to test if it was installed successfully +# +# all, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4: +# version: [optional] Specific version of Ruby gem +# +gem_available: + mixlib_config: + name: mixlib-config + all: + version: 2.2.4 + rb_inotify: + name: rb-inotify + all: + version: 0.9.10 + mdl: + name: mdl + check: mdl --version | grep -E '[.0-9]+' + scss_lint: + name: scss_lint + all: + version: 0.57.1 + sass: + name: sass + check: sass --version | grep -E '[.0-9]+' + + +# ------------------------------------------------------------------------------------------------- +# npm (Node) definition # ------------------------------------------------------------------------------------------------- # name: Name of the Node npm package @@ -253,37 +312,25 @@ npm_available: # ------------------------------------------------------------------------------------------------- -# Ruby Gems definition +# pip (Python) definition # ------------------------------------------------------------------------------------------------- -# name: Name of the Ruby gem package +# name: Name of the Python pip package # all: is generic version of defines # 7.2: is specific version of defines # disabled: [optional] Array of PHP versions for which to disable this module # check: [optional] Include a check command to test if it was installed successfully # # all, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4: -# version: [optional] Specific version of Ruby gem +# version: [optional] Specific version of Python pip package # -gem_available: - mixlib_config: - name: mixlib-config - all: - version: 2.2.4 - rb_inotify: - name: rb-inotify - all: - version: 0.9.10 - mdl: - name: mdl - check: mdl --version | grep -E '[.0-9]+' - scss_lint: - name: scss_lint - all: - version: 0.57.1 - sass: - name: sass - check: sass --version | grep -E '[.0-9]+' +pip_available: + ansible: + name: ansible + check: ansible --version | grep -E '^ansible [.0-9]+$' + yamllint: + name: yamllint + check: yamllint --version 2>&1 | grep -E '[.0-9]+' # ------------------------------------------------------------------------------------------------- @@ -339,13 +386,6 @@ software_available: su -c '. /opt/nvm/nvm.sh; nvm install node' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \ - asgardcms: - disabled: [5.2, 5.3, 5.4, 8.0] - check: asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' - all: - command: | - COMPOSER_HOME="{{ compose_home }}" composer global require asgardcms/asgardcms-installer \ - && ln -s {{ compose_home }}/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/asgardcms \ awesomeci: check: | mdl --version | grep -E '[.0-9]+' \ @@ -426,13 +466,6 @@ software_available: && rm -rf /usr/local/src/drush9/docs \ && rm -rf /usr/local/src/drush9/examples \ && rm -rf /usr/local/src/drush9/misc \ - codeception: - disabled: [5.2, 8.0] - check: codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' - all: - command: | - COMPOSER_HOME="{{ compose_home }}" composer global require codeception/codeception \ - && ln -s {{ compose_home }}/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ drupalconsole: disabled: [5.2, 5.3, 5.4] check: drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' @@ -499,13 +532,6 @@ software_available: && v="${BASH_PROFILE}" su ${MY_USER} -c -p \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ - lumen: - disabled: [5.2, 5.3, 5.4, 8.0] - check: lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' - all: - command: | - COMPOSER_HOME="{{ compose_home }}" composer global require laravel/lumen-installer \ - && ln -s {{ compose_home }}/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ mhsendmail: all: command: | @@ -634,13 +660,6 @@ software_available: command: | curl -qL https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \ && chmod +x /usr/local/bin/phpunit \ - photon: - disabled: [5.2, 5.3, 5.4, 8.0] - check: photon --version | grep -E 'Installer [.0-9]+' - all: - command: | - COMPOSER_HOME="{{ compose_home }}" composer global require "photoncms/installer" \ - && ln -s {{ compose_home }}/vendor/photoncms/installer/photon /usr/local/bin/photon \ symfony: disabled: [5.2, 5.3] check: symfony --version | grep -E 'version\s*[.0-9]+'