Skip to content

Commit 90ecbd6

Browse files
cytopiacytopia
authored
Merge pull request #92 from devilbox/release-0.70
Release 0.70
2 parents eefda31 + 1201ee4 commit 90ecbd6

15 files changed

Lines changed: 48 additions & 39 deletions

‎.travis.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -99,41 +99,41 @@ script:
9999
echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin &&
100100
if [ "${TRAVIS_BRANCH}" == "master" ]; then
101101
echo "Pushing latest";
102-
docker push "${IMAGE}:${PHP}-base";
103-
docker push "${IMAGE}:${PHP}-mods";
104-
docker push "${IMAGE}:${PHP}-prod";
105-
docker push "${IMAGE}:${PHP}-work";
102+
until docker push "${IMAGE}:${PHP}-base"; do sleep 1; done;
103+
until docker push "${IMAGE}:${PHP}-mods"; do sleep 1; done;
104+
until docker push "${IMAGE}:${PHP}-prod"; do sleep 1; done;
105+
until docker push "${IMAGE}:${PHP}-work"; do sleep 1; done;
106106
elif [[ ${TRAVIS_BRANCH} =~ ^(release-[.0-9]+)$ ]]; then
107107
echo "Pushing branch ${TRAVIS_BRANCH}";
108108
docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}" &&
109109
docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}" &&
110110
docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}" &&
111111
docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}" &&
112-
docker push "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}";
113-
docker push "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}";
114-
docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}";
115-
docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}";
112+
until docker push "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}"; do sleep 1; done;
113+
until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}"; do sleep 1; done;
114+
until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}"; do sleep 1; done;
115+
until docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}"; do sleep 1; done;
116116
elif [ -n "${TRAVIS_TAG}" ]; then
117117
echo "Pushing tag ${TRAVIS_TAG}";
118118
docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_TAG}" &&
119119
docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}" &&
120120
docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}" &&
121121
docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_TAG}" &&
122-
docker push "${IMAGE}:${PHP}-base-${TRAVIS_TAG}";
123-
docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}";
124-
docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}";
125-
docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}";
122+
until docker push "${IMAGE}:${PHP}-base-${TRAVIS_TAG}"; do sleep 1; done;
123+
until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}"; do sleep 1; done;
124+
until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}"; do sleep 1; done;
125+
until docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}"; do sleep 1; done;
126126
elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ]; then
127127
if MY_TAG="$( git describe --exact-match "$(git rev-parse HEAD)" 2>/dev/null )"; then
128128
echo "Pushing cron tag ${MY_TAG}";
129129
docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${MY_TAG}" &&
130130
docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${MY_TAG}" &&
131131
docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${MY_TAG}" &&
132132
docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${MY_TAG}" &&
133-
docker push "${IMAGE}:${PHP}-base-${MY_TAG}";
134-
docker push "${IMAGE}:${PHP}-mods-${MY_TAG}";
135-
docker push "${IMAGE}:${PHP}-prod-${MY_TAG}";
136-
docker push "${IMAGE}:${PHP}-work-${MY_TAG}";
133+
until docker push "${IMAGE}:${PHP}-base-${MY_TAG}"; do sleep 1; done;
134+
until docker push "${IMAGE}:${PHP}-mods-${MY_TAG}"; do sleep 1; done;
135+
until docker push "${IMAGE}:${PHP}-prod-${MY_TAG}"; do sleep 1; done;
136+
until docker push "${IMAGE}:${PHP}-work-${MY_TAG}"; do sleep 1; done;
137137
fi
138138
else
139139
echo "Skipping push to dockerhub on normal branches";

‎Dockerfiles/work/Dockerfile-5.4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ RUN set -x \
154154
&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
155155
\
156156
# deployer
157-
&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
157+
&& curl -sS https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep \
158158
&& chmod +x /usr/local/bin/dep \
159159
# drush7
160160
&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -376,7 +376,7 @@ RUN set -x \
376376
&& gulp --version | grep -E '[.0-9]+' \
377377
\
378378
&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
379-
&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
379+
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
380380
&& drush7 --version | grep -E '7[.0-9]+\s*$' \
381381
&& drush8 --version | grep -E '8[.0-9]+\s*$' \
382382
&& git-flow version | grep -E '[.0-9]+' \

‎Dockerfiles/work/Dockerfile-5.5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN set -x \
158158
&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
159159
\
160160
# deployer
161-
&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
161+
&& curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \
162162
&& chmod +x /usr/local/bin/dep \
163163
# drush7
164164
&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -388,7 +388,7 @@ RUN set -x \
388388
&& gulp --version | grep -E '[.0-9]+' \
389389
\
390390
&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
391-
&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
391+
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
392392
&& drush7 --version | grep -E '7[.0-9]+\s*$' \
393393
&& drush8 --version | grep -E '8[.0-9]+\s*$' \
394394
&& drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \

‎Dockerfiles/work/Dockerfile-5.6‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN set -x \
158158
&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
159159
\
160160
# deployer
161-
&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
161+
&& curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \
162162
&& chmod +x /usr/local/bin/dep \
163163
# drush7
164164
&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -401,7 +401,7 @@ RUN set -x \
401401
&& gulp --version | grep -E '[.0-9]+' \
402402
\
403403
&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
404-
&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
404+
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
405405
&& drush7 --version | grep -E '7[.0-9]+\s*$' \
406406
&& drush8 --version | grep -E '8[.0-9]+\s*$' \
407407
&& drush9 --version | grep -E '9[.0-9]+\s*$' \

‎Dockerfiles/work/Dockerfile-7.0‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN set -x \
158158
&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
159159
\
160160
# deployer
161-
&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
161+
&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
162162
&& chmod +x /usr/local/bin/dep \
163163
# drush7
164164
&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -401,7 +401,7 @@ RUN set -x \
401401
&& gulp --version | grep -E '[.0-9]+' \
402402
\
403403
&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
404-
&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
404+
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
405405
&& drush7 --version | grep -E '7[.0-9]+\s*$' \
406406
&& drush8 --version | grep -E '8[.0-9]+\s*$' \
407407
&& drush9 --version | grep -E '9[.0-9]+\s*$' \

‎Dockerfiles/work/Dockerfile-7.1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN set -x \
158158
&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
159159
\
160160
# deployer
161-
&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
161+
&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
162162
&& chmod +x /usr/local/bin/dep \
163163
# drush7
164164
&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -401,7 +401,7 @@ RUN set -x \
401401
&& gulp --version | grep -E '[.0-9]+' \
402402
\
403403
&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
404-
&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
404+
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
405405
&& drush7 --version | grep -E '7[.0-9]+\s*$' \
406406
&& drush8 --version | grep -E '8[.0-9]+\s*$' \
407407
&& drush9 --version | grep -E '9[.0-9]+\s*$' \

‎Dockerfiles/work/Dockerfile-7.2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN set -x \
158158
&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
159159
\
160160
# deployer
161-
&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
161+
&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
162162
&& chmod +x /usr/local/bin/dep \
163163
# drush7
164164
&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -401,7 +401,7 @@ RUN set -x \
401401
&& gulp --version | grep -E '[.0-9]+' \
402402
\
403403
&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
404-
&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
404+
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
405405
&& drush7 --version | grep -E '7[.0-9]+\s*$' \
406406
&& drush8 --version | grep -E '8[.0-9]+\s*$' \
407407
&& drush9 --version | grep -E '9[.0-9]+\s*$' \

‎Dockerfiles/work/Dockerfile-7.3‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN set -x \
158158
&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
159159
\
160160
# deployer
161-
&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
161+
&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
162162
&& chmod +x /usr/local/bin/dep \
163163
# drush7
164164
&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -390,7 +390,7 @@ RUN set -x \
390390
&& gulp --version | grep -E '[.0-9]+' \
391391
\
392392
&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
393-
&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
393+
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
394394
&& drush7 --version | grep -E '7[.0-9]+\s*$' \
395395
&& drush8 --version | grep -E '8[.0-9]+\s*$' \
396396
&& drush9 --version | grep -E '9[.0-9]+\s*$' \

‎Dockerfiles/work/Dockerfile-7.4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ RUN set -x \
158158
&& ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
159159
\
160160
# deployer
161-
&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
161+
&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
162162
&& chmod +x /usr/local/bin/dep \
163163
# drush7
164164
&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -386,7 +386,7 @@ RUN set -x \
386386
&& gulp --version | grep -E '[.0-9]+' \
387387
\
388388
&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
389-
&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
389+
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
390390
&& drush7 --version | grep -E '7[.0-9]+\s*$' \
391391
&& drush8 --version | grep -E '8[.0-9]+\s*$' \
392392
&& drush9 --version | grep -E '9[.0-9]+\s*$' \

‎build/ansible/group_vars/all.yml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,18 @@ software_available:
354354
command: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
355355
deployer:
356356
disabled: [5.2, 5.3]
357-
check: dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+'
357+
check: dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+'
358+
5.4:
359+
command: curl -sS https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep
360+
post: chmod +x /usr/local/bin/dep
361+
5.5:
362+
command: curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
363+
post: chmod +x /usr/local/bin/dep
364+
5.6:
365+
command: curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
366+
post: chmod +x /usr/local/bin/dep
358367
all:
359-
command: curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep
368+
command: curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep
360369
post: chmod +x /usr/local/bin/dep
361370
drush7:
362371
disabled: [5.2]

0 commit comments

Comments
 (0)