Skip to content

Commit 59b1197

Browse files
cytopiacytopia
authored
Merge branch 'master' into bugfix/drupalconsole
2 parents 0bdc196 + 12e5111 commit 59b1197

File tree

14 files changed

+110
-86
lines changed

14 files changed

+110
-86
lines changed

‎Dockerfiles/work/Dockerfile-5.2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,12 @@ fi \
264264
\
265265
\
266266
# -------------------- wkhtmltopdf --------------------
267-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
267+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
268268
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
269269
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
270270
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
271271
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
272-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
272+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
273273
&& dpkg -i /tmp/wkhtmltopdf.deb \
274274
&& rm -f /tmp/wkhtmltopdf.deb; \
275275
fi \

‎Dockerfiles/work/Dockerfile-5.3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,12 @@ fi \
318318
\
319319
\
320320
# -------------------- wkhtmltopdf --------------------
321-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
321+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
322322
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
323323
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
324324
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
325325
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
326-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
326+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
327327
&& dpkg -i /tmp/wkhtmltopdf.deb \
328328
&& rm -f /tmp/wkhtmltopdf.deb; \
329329
fi \

‎Dockerfiles/work/Dockerfile-5.4

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,17 +347,19 @@ fi \
347347
\
348348
\
349349
# -------------------- symfony --------------------
350-
&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
351-
&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
352-
&& chmod +x /usr/local/bin/symfony \
350+
&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
351+
&& curl -sS -L --fail -o /tmp/symfonycli.deb https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
352+
&& dpkg -i /tmp/symfonycli.deb \
353+
&& rm -f /tmp/symfonycli.deb \
354+
\
353355
\
354356
# -------------------- wkhtmltopdf --------------------
355-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
357+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
356358
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
357359
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
358360
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
359361
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
360-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
362+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
361363
&& dpkg -i /tmp/wkhtmltopdf.deb \
362364
&& rm -f /tmp/wkhtmltopdf.deb; \
363365
fi \
@@ -755,7 +757,7 @@ fi \
755757
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
756758
&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
757759
&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
758-
&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
760+
&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
759761
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
760762
&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
761763
\

‎Dockerfiles/work/Dockerfile-5.5

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -353,17 +353,19 @@ fi \
353353
\
354354
\
355355
# -------------------- symfony --------------------
356-
&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
357-
&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
358-
&& chmod +x /usr/local/bin/symfony \
356+
&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
357+
&& curl -sS -L --fail -o /tmp/symfonycli.deb https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
358+
&& dpkg -i /tmp/symfonycli.deb \
359+
&& rm -f /tmp/symfonycli.deb \
360+
\
359361
\
360362
# -------------------- wkhtmltopdf --------------------
361-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
363+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases | awk -F\" '/wkhtmltopdf.*.jessie_amd64\.deb/{print $(NF-1)}' | head -1 )" \
362364
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
363365
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
364366
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
365367
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
366-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
368+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
367369
&& dpkg -i /tmp/wkhtmltopdf.deb \
368370
&& rm -f /tmp/wkhtmltopdf.deb; \
369371
fi \
@@ -770,7 +772,7 @@ fi \
770772
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
771773
&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
772774
&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
773-
&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
775+
&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
774776
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
775777
&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
776778
\

‎Dockerfiles/work/Dockerfile-5.6

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -373,17 +373,19 @@ fi \
373373
\
374374
\
375375
# -------------------- symfony --------------------
376-
&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
377-
&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
378-
&& chmod +x /usr/local/bin/symfony \
376+
&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
377+
&& curl -sS -L --fail -o /tmp/symfonycli.deb https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
378+
&& dpkg -i /tmp/symfonycli.deb \
379+
&& rm -f /tmp/symfonycli.deb \
380+
\
379381
\
380382
# -------------------- wkhtmltopdf --------------------
381-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
383+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
382384
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
383385
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
384386
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
385387
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
386-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
388+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
387389
&& dpkg -i /tmp/wkhtmltopdf.deb \
388390
&& rm -f /tmp/wkhtmltopdf.deb; \
389391
fi \
@@ -788,7 +790,7 @@ fi \
788790
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
789791
&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
790792
&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
791-
&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
793+
&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
792794
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
793795
&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
794796
\

‎Dockerfiles/work/Dockerfile-7.0

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,19 @@ fi \
354354
\
355355
\
356356
# -------------------- symfony --------------------
357-
&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
358-
&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
359-
&& chmod +x /usr/local/bin/symfony \
357+
&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
358+
&& curl -sS -L --fail -o /tmp/symfonycli.deb https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
359+
&& dpkg -i /tmp/symfonycli.deb \
360+
&& rm -f /tmp/symfonycli.deb \
361+
\
360362
\
361363
# -------------------- wkhtmltopdf --------------------
362-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
364+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
363365
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
364366
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
365367
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
366368
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
367-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
369+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
368370
&& dpkg -i /tmp/wkhtmltopdf.deb \
369371
&& rm -f /tmp/wkhtmltopdf.deb; \
370372
fi \
@@ -767,7 +769,7 @@ fi \
767769
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
768770
&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
769771
&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
770-
&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
772+
&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
771773
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
772774
&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
773775
\

‎Dockerfiles/work/Dockerfile-7.1

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,17 +347,19 @@ fi \
347347
\
348348
\
349349
# -------------------- symfony --------------------
350-
&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
351-
&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
352-
&& chmod +x /usr/local/bin/symfony \
350+
&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
351+
&& curl -sS -L --fail -o /tmp/symfonycli.deb https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
352+
&& dpkg -i /tmp/symfonycli.deb \
353+
&& rm -f /tmp/symfonycli.deb \
354+
\
353355
\
354356
# -------------------- wkhtmltopdf --------------------
355-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
357+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
356358
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
357359
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
358360
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
359361
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
360-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
362+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
361363
&& dpkg -i /tmp/wkhtmltopdf.deb \
362364
&& rm -f /tmp/wkhtmltopdf.deb; \
363365
fi \
@@ -760,7 +762,7 @@ fi \
760762
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
761763
&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
762764
&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
763-
&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
765+
&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
764766
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
765767
&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
766768
\

‎Dockerfiles/work/Dockerfile-7.2

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -367,17 +367,19 @@ fi \
367367
\
368368
\
369369
# -------------------- symfony --------------------
370-
&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
371-
&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
372-
&& chmod +x /usr/local/bin/symfony \
370+
&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
371+
&& curl -sS -L --fail -o /tmp/symfonycli.deb https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
372+
&& dpkg -i /tmp/symfonycli.deb \
373+
&& rm -f /tmp/symfonycli.deb \
374+
\
373375
\
374376
# -------------------- wkhtmltopdf --------------------
375-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
377+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
376378
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
377379
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
378380
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
379381
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
380-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
382+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
381383
&& dpkg -i /tmp/wkhtmltopdf.deb \
382384
&& rm -f /tmp/wkhtmltopdf.deb; \
383385
fi \
@@ -782,7 +784,7 @@ fi \
782784
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
783785
&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
784786
&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
785-
&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
787+
&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
786788
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
787789
&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
788790
\

‎Dockerfiles/work/Dockerfile-7.3

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,17 +368,19 @@ fi \
368368
\
369369
\
370370
# -------------------- symfony --------------------
371-
&& SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \
372-
&& curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \
373-
&& chmod +x /usr/local/bin/symfony \
371+
&& VERSION="$(curl -s https://api.github.com/repos/symfony-cli/symfony-cli/releases/latest | awk -F\" '/symfony-cli_.*._amd64\.deb/{print $(NF-1)}' | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')" \
372+
&& curl -sS -L --fail -o /tmp/symfonycli.deb https://github.com/symfony-cli/symfony-cli/releases/download/v${VERSION}/symfony-cli_${VERSION}_$(dpkg-architecture --query DEB_HOST_ARCH).deb \
373+
&& dpkg -i /tmp/symfonycli.deb \
374+
&& rm -f /tmp/symfonycli.deb \
375+
\
374376
\
375377
# -------------------- wkhtmltopdf --------------------
376-
&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
378+
&& VERSION="$(curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases | awk -F\" '/wkhtmltopdf.*.stretch_amd64\.deb/{print $(NF-1)}' | head -1 )" \
377379
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
378380
DEBIAN_FRONTEND=noninteractive apt-get update -qq \
379381
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
380382
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
381-
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
383+
&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb ${VERSION} \
382384
&& dpkg -i /tmp/wkhtmltopdf.deb \
383385
&& rm -f /tmp/wkhtmltopdf.deb; \
384386
fi \
@@ -783,7 +785,7 @@ fi \
783785
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
784786
&& phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \
785787
&& phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \
786-
&& symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \
788+
&& symfony -V | grep -Ei 'version\s[0-9][.0-9]+' \
787789
&& if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)"; fi \
788790
&& wp --allow-root --version | grep -E '[0-9][.0-9]+' \
789791
\

0 commit comments

Comments
 (0)