From 1be3fa70f2c55ce0c324267ac6ce630dbab62c24 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 11 Jan 2019 11:06:18 +0100 Subject: [PATCH 1/4] 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 49d817da..f2e218c0 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 2d939eb5..e1146bf7 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 4055043d..bb0bba1d 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 f377db1e..f1ed391f 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 81737bad..bd88cfa3 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 4563ff8d..e3538692 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 46ffd2dc..d9dd4cc7 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 4bf372ae..620c87be 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 2aecb523..eb37b40b 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] From 847ea4e6a13c4b62bdadea537cd9229359287bd4 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 11 Jan 2019 11:18:02 +0100 Subject: [PATCH 2/4] Fix: Repeat docker pull until success --- tests/base/04-test-run_nginx.sh | 2 +- tests/prod/05-test-env-forward_ports_to_localhost.sh | 2 +- tests/prod/06-test-mount-custom_ini.sh | 2 +- tests/prod/07-test-mount-custom_fpm_conf.sh | 2 +- tests/work/01-test-env-mysqldump-secure.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/base/04-test-run_nginx.sh b/tests/base/04-test-run_nginx.sh index fb9e4265..a0a7e434 100755 --- a/tests/base/04-test-run_nginx.sh +++ b/tests/base/04-test-run_nginx.sh @@ -38,7 +38,7 @@ chmod 0777 "${DOC_ROOT_HOST}" chmod 0644 "${DOC_ROOT_HOST}/index.php" # Pull Image -run "while ! docker pull ${CONTAINER}; do sleep 1; done" +run "until docker pull ${CONTAINER}; do sleep 1; done" # Start PHP-FPM did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT}" )" diff --git a/tests/prod/05-test-env-forward_ports_to_localhost.sh b/tests/prod/05-test-env-forward_ports_to_localhost.sh index c68fe157..cfd27d62 100755 --- a/tests/prod/05-test-env-forward_ports_to_localhost.sh +++ b/tests/prod/05-test-env-forward_ports_to_localhost.sh @@ -25,7 +25,7 @@ FLAVOUR="${3}" CONTAINER="mysql:5.6" # Pull Container -run "while ! docker pull ${CONTAINER}; do sleep 1; done" +run "until docker pull ${CONTAINER}; do sleep 1; done" # Start mysql container mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ALLOW_EMPTY_PASSWORD=yes" )" diff --git a/tests/prod/06-test-mount-custom_ini.sh b/tests/prod/06-test-mount-custom_ini.sh index 468c3995..89e021ea 100755 --- a/tests/prod/06-test-mount-custom_ini.sh +++ b/tests/prod/06-test-mount-custom_ini.sh @@ -44,7 +44,7 @@ chmod 0777 "${DOC_ROOT_HOST}" chmod 0644 "${DOC_ROOT_HOST}/index.php" # Pull container -run "while ! docker pull ${CONTAINER}; do sleep 1; done" +run "until docker pull ${CONTAINER}; do sleep 1; done" # Start PHP-FPM did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_INI_HOST}:${PHP_INI_CONT}" )" diff --git a/tests/prod/07-test-mount-custom_fpm_conf.sh b/tests/prod/07-test-mount-custom_fpm_conf.sh index b10cb2e3..9d0f4e41 100755 --- a/tests/prod/07-test-mount-custom_fpm_conf.sh +++ b/tests/prod/07-test-mount-custom_fpm_conf.sh @@ -49,7 +49,7 @@ chmod 0777 "${DOC_ROOT_HOST}" chmod 0644 "${DOC_ROOT_HOST}/index.php" # Pull container -run "while ! docker pull ${CONTAINER}; do sleep 1; done" +run "until docker pull ${CONTAINER}; do sleep 1; done" # Start PHP-FPM did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_CNF_HOST}:${PHP_CNF_CONT}" )" diff --git a/tests/work/01-test-env-mysqldump-secure.sh b/tests/work/01-test-env-mysqldump-secure.sh index 9333a1af..6ccd9897 100755 --- a/tests/work/01-test-env-mysqldump-secure.sh +++ b/tests/work/01-test-env-mysqldump-secure.sh @@ -27,7 +27,7 @@ MOUNTPOINT="$( mktemp --directory )" CONTAINER="mysql:5.6" # Pull Container -run "while ! docker pull ${CONTAINER}; do sleep 1; done" +run "until docker pull ${CONTAINER}; do sleep 1; done" # Start mysql container mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" )" From a128aa33c06e6412ae7beea1f59e383c52561a94 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 11 Jan 2019 11:18:42 +0100 Subject: [PATCH 3/4] Fix docker push until success --- .travis.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04e7a629..4f7d0d3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,30 +99,30 @@ script: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin && if [ "${TRAVIS_BRANCH}" == "master" ]; then echo "Pushing latest"; - docker push "${IMAGE}:${PHP}-base"; - docker push "${IMAGE}:${PHP}-mods"; - docker push "${IMAGE}:${PHP}-prod"; - docker push "${IMAGE}:${PHP}-work"; + until docker push "${IMAGE}:${PHP}-base"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-mods"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-prod"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-work"; do sleep 1; done; elif [[ ${TRAVIS_BRANCH} =~ ^(release-[.0-9]+)$ ]]; then echo "Pushing branch ${TRAVIS_BRANCH}"; docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}" && docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}" && docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}" && docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}" && - docker push "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}"; - docker push "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}"; - docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}"; - docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}"; + until docker push "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}"; do sleep 1; done; elif [ -n "${TRAVIS_TAG}" ]; then echo "Pushing tag ${TRAVIS_TAG}"; docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_TAG}" && docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}" && docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}" && docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_TAG}" && - docker push "${IMAGE}:${PHP}-base-${TRAVIS_TAG}"; - docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}"; - docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}"; - docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}"; + until docker push "${IMAGE}:${PHP}-base-${TRAVIS_TAG}"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}"; do sleep 1; done; elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ]; then if MY_TAG="$( git describe --exact-match "$(git rev-parse HEAD)" 2>/dev/null )"; then echo "Pushing cron tag ${MY_TAG}"; @@ -130,10 +130,10 @@ script: docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${MY_TAG}" && docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${MY_TAG}" && docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${MY_TAG}" && - docker push "${IMAGE}:${PHP}-base-${MY_TAG}"; - docker push "${IMAGE}:${PHP}-mods-${MY_TAG}"; - docker push "${IMAGE}:${PHP}-prod-${MY_TAG}"; - docker push "${IMAGE}:${PHP}-work-${MY_TAG}"; + until docker push "${IMAGE}:${PHP}-base-${MY_TAG}"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-mods-${MY_TAG}"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-prod-${MY_TAG}"; do sleep 1; done; + until docker push "${IMAGE}:${PHP}-work-${MY_TAG}"; do sleep 1; done; fi else echo "Skipping push to dockerhub on normal branches"; From 1201ee413530c77ae4bb194fd51c952b6f2baa70 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 11 Jan 2019 16:52:42 +0100 Subject: [PATCH 4/4] Fix deployer version for PHP 5.4 --- Dockerfiles/work/Dockerfile-5.4 | 4 ++-- 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 | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index f2e218c0..de58b31b 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 -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \ + && curl -sS https://deployer.org/releases/v3.3.0/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 \ @@ -376,7 +376,7 @@ RUN set -x \ && gulp --version | grep -E '[.0-9]+' \ \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && dep --version 2>/dev/null | grep -E 'Deployer\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*$' \ && git-flow version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index e1146bf7..bcd483c8 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -388,7 +388,7 @@ RUN set -x \ && gulp --version | grep -E '[.0-9]+' \ \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && dep --version 2>/dev/null | grep -E 'Deployer\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*$' \ && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index bb0bba1d..79eaad33 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -401,7 +401,7 @@ RUN set -x \ && gulp --version | grep -E '[.0-9]+' \ \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && dep --version 2>/dev/null | grep -E 'Deployer\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*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index f1ed391f..f6817602 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -401,7 +401,7 @@ RUN set -x \ && gulp --version | grep -E '[.0-9]+' \ \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && dep --version 2>/dev/null | grep -E 'Deployer\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*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index bd88cfa3..88462161 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -401,7 +401,7 @@ RUN set -x \ && gulp --version | grep -E '[.0-9]+' \ \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && dep --version 2>/dev/null | grep -E 'Deployer\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*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index e3538692..6e542c1e 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -401,7 +401,7 @@ RUN set -x \ && gulp --version | grep -E '[.0-9]+' \ \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && dep --version 2>/dev/null | grep -E 'Deployer\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*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index d9dd4cc7..8708d503 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -390,7 +390,7 @@ RUN set -x \ && gulp --version | grep -E '[.0-9]+' \ \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && dep --version 2>/dev/null | grep -E 'Deployer\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*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 620c87be..855f8556 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -386,7 +386,7 @@ RUN set -x \ && gulp --version | grep -E '[.0-9]+' \ \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && dep --version 2>/dev/null | grep -E 'Deployer\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*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index eb37b40b..ac3dbe7f 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -354,9 +354,9 @@ software_available: command: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer deployer: disabled: [5.2, 5.3] - check: dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' + check: dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' 5.4: - command: curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep + command: curl -sS https://deployer.org/releases/v3.3.0/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