From fc6df6bdaf298849f56b5246ad7de907ebc8494f Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 5 Jan 2020 13:28:48 +0100 Subject: [PATCH] Use latest Symfony version --- Dockerfiles/work/Dockerfile-5.4 | 5 +++-- Dockerfiles/work/Dockerfile-5.5 | 5 +++-- Dockerfiles/work/Dockerfile-5.6 | 5 +++-- Dockerfiles/work/Dockerfile-7.0 | 5 +++-- Dockerfiles/work/Dockerfile-7.1 | 5 +++-- Dockerfiles/work/Dockerfile-7.2 | 5 +++-- Dockerfiles/work/Dockerfile-7.3 | 5 +++-- Dockerfiles/work/Dockerfile-7.4 | 5 +++-- Dockerfiles/work/Dockerfile-8.0 | 5 +++-- build/ansible/group_vars/all/work.yml | 3 ++- 10 files changed, 29 insertions(+), 19 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 161a2c4..f237130 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -304,7 +304,8 @@ RUN set -eux \ \ \ # -------------------- symfony -------------------- - && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ + && SYMFONY_VERSION="$( curl --fail -sS -L https://get.symfony.com/cli/LATEST )" \ + && curl -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_386" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- @@ -546,7 +547,7 @@ RUN set -eux \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpmd --version | grep -E '^PHPMD [.0-9]+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony --version | grep -E 'version\s*[.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index d945eba..3820763 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -309,7 +309,8 @@ RUN set -eux \ \ \ # -------------------- symfony -------------------- - && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ + && SYMFONY_VERSION="$( curl --fail -sS -L https://get.symfony.com/cli/LATEST )" \ + && curl -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_386" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- @@ -564,7 +565,7 @@ RUN set -eux \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpmd --version | grep -E '^PHPMD [.0-9]+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony --version | grep -E 'version\s*[.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index bd54206..a2b2953 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -322,7 +322,8 @@ RUN set -eux \ \ \ # -------------------- symfony -------------------- - && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ + && SYMFONY_VERSION="$( curl --fail -sS -L https://get.symfony.com/cli/LATEST )" \ + && curl -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_386" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- @@ -578,7 +579,7 @@ RUN set -eux \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpmd --version | grep -E '^PHPMD [.0-9]+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony --version | grep -E 'version\s*[.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index e882441..bd68f24 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -322,7 +322,8 @@ RUN set -eux \ \ \ # -------------------- symfony -------------------- - && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ + && SYMFONY_VERSION="$( curl --fail -sS -L https://get.symfony.com/cli/LATEST )" \ + && curl -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_386" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- @@ -578,7 +579,7 @@ RUN set -eux \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpmd --version | grep -E '^PHPMD [.0-9]+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony --version | grep -E 'version\s*[.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 12965de..56ff875 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -322,7 +322,8 @@ RUN set -eux \ \ \ # -------------------- symfony -------------------- - && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ + && SYMFONY_VERSION="$( curl --fail -sS -L https://get.symfony.com/cli/LATEST )" \ + && curl -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_386" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- @@ -578,7 +579,7 @@ RUN set -eux \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpmd --version | grep -E '^PHPMD [.0-9]+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony --version | grep -E 'version\s*[.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index c8582ae..16da9b9 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -323,7 +323,8 @@ RUN set -eux \ \ \ # -------------------- symfony -------------------- - && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ + && SYMFONY_VERSION="$( curl --fail -sS -L https://get.symfony.com/cli/LATEST )" \ + && curl -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_386" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- @@ -579,7 +580,7 @@ RUN set -eux \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpmd --version | grep -E '^PHPMD [.0-9]+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony --version | grep -E 'version\s*[.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 3ce0ce3..72c12e2 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -309,7 +309,8 @@ RUN set -eux \ \ \ # -------------------- symfony -------------------- - && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ + && SYMFONY_VERSION="$( curl --fail -sS -L https://get.symfony.com/cli/LATEST )" \ + && curl -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_386" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- @@ -564,7 +565,7 @@ RUN set -eux \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ && phpmd --version | grep -E '^PHPMD [.0-9]+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony --version | grep -E 'version\s*[.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index eb0379f..77297ef 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -304,7 +304,8 @@ RUN set -eux \ \ \ # -------------------- symfony -------------------- - && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ + && SYMFONY_VERSION="$( curl --fail -sS -L https://get.symfony.com/cli/LATEST )" \ + && curl -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_386" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- @@ -558,7 +559,7 @@ RUN set -eux \ && phpcbf --version | grep -E 'version [.0-9]+' \ && phpmd --version | grep -E '^PHPMD [.0-9]+' \ && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony --version | grep -E 'version\s*[.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 3f5e724..131f678 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -242,7 +242,8 @@ RUN set -eux \ \ \ # -------------------- symfony -------------------- - && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ + && SYMFONY_VERSION="$( curl --fail -sS -L https://get.symfony.com/cli/LATEST )" \ + && curl -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_386" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- @@ -471,7 +472,7 @@ RUN set -eux \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && symfony --version | grep -E 'version\s*[.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ && wp --allow-root --version | grep -E '[.0-9]+' \ \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 7adab05..8bc2a25 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -771,7 +771,8 @@ software_available: disabled: [5.2, 5.3] check: symfony --version | grep -E 'version\s*[.0-9]+' all: - command: curl https://symfony.com/installer -L -o /usr/local/bin/symfony + pre: SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" + command: curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_386" > /usr/local/bin/symfony post: chmod +x /usr/local/bin/symfony wkhtmltopdf: check: wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)"