From 1be3fa70f2c55ce0c324267ac6ce630dbab62c24 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 11 Jan 2019 11:06:18 +0100 Subject: [PATCH] Fix install of deployer for PHP < 7 --- Dockerfiles/work/Dockerfile-5.4 | 2 +- Dockerfiles/work/Dockerfile-5.5 | 2 +- Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- Dockerfiles/work/Dockerfile-7.1 | 2 +- Dockerfiles/work/Dockerfile-7.2 | 2 +- Dockerfiles/work/Dockerfile-7.3 | 2 +- Dockerfiles/work/Dockerfile-7.4 | 2 +- build/ansible/group_vars/all.yml | 11 ++++++++++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 49d817d..f2e218c 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -154,7 +154,7 @@ RUN set -x \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer - && curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ + && curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ # drush7 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 2d939eb..e1146bf 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -158,7 +158,7 @@ RUN set -x \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer - && curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ + && curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ # drush7 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 4055043..bb0bba1 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -158,7 +158,7 @@ RUN set -x \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer - && curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ + && curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ # drush7 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index f377db1..f1ed391 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -158,7 +158,7 @@ RUN set -x \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer - && curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ + && curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ # drush7 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 81737ba..bd88cfa 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -158,7 +158,7 @@ RUN set -x \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer - && curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ + && curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ # drush7 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 4563ff8..e353869 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -158,7 +158,7 @@ RUN set -x \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer - && curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ + && curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ # drush7 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 46ffd2d..d9dd4cc 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -158,7 +158,7 @@ RUN set -x \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer - && curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ + && curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ # drush7 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 4bf372a..620c87b 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -158,7 +158,7 @@ RUN set -x \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer - && curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ + && curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ && chmod +x /usr/local/bin/dep \ # drush7 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 2aecb52..eb37b40 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -355,8 +355,17 @@ software_available: deployer: disabled: [5.2, 5.3] check: dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' + 5.4: + command: curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep + post: chmod +x /usr/local/bin/dep + 5.5: + command: curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep + post: chmod +x /usr/local/bin/dep + 5.6: + command: curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep + post: chmod +x /usr/local/bin/dep all: - command: curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep + command: curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep post: chmod +x /usr/local/bin/dep drush7: disabled: [5.2]