From 82aa00498eb9d557e7de9e783d974a9d46fc373b Mon Sep 17 00:00:00 2001 From: Michael Stucki Date: Tue, 24 Jan 2023 10:37:17 +0100 Subject: [PATCH 1/2] Fix typo --- 1/Dockerfile | 4 ++-- 2.19/Dockerfile | 4 ++-- 2/Dockerfile | 4 ++-- 3.12/Dockerfile | 4 ++-- 3.13/Dockerfile | 4 ++-- 3/Dockerfile | 4 ++-- Dockerfile.template | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/1/Dockerfile b/1/Dockerfile index 4074cd9..54cd74d 100644 --- a/1/Dockerfile +++ b/1/Dockerfile @@ -1,8 +1,8 @@ FROM php:7.1-alpine -ENV PHP_CS_FIXER_VERISON 1.13.3 +ENV PHP_CS_FIXER_VERSION 1.13.3 # hadolint ignore=DL3018 -RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERISON/php-cs-fixer.phar -o php-cs-fixer \ +RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERSION/php-cs-fixer.phar -o php-cs-fixer \ && chmod +x php-cs-fixer \ && mv php-cs-fixer /usr/local/bin/php-cs-fixer diff --git a/2.19/Dockerfile b/2.19/Dockerfile index fd90f98..1f40193 100644 --- a/2.19/Dockerfile +++ b/2.19/Dockerfile @@ -1,8 +1,8 @@ FROM php:8.0-alpine -ENV PHP_CS_FIXER_VERISON 2.19.3 +ENV PHP_CS_FIXER_VERSION 2.19.3 # hadolint ignore=DL3018 -RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERISON/php-cs-fixer.phar -o php-cs-fixer \ +RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERSION/php-cs-fixer.phar -o php-cs-fixer \ && chmod +x php-cs-fixer \ && mv php-cs-fixer /usr/local/bin/php-cs-fixer diff --git a/2/Dockerfile b/2/Dockerfile index fd90f98..1f40193 100644 --- a/2/Dockerfile +++ b/2/Dockerfile @@ -1,8 +1,8 @@ FROM php:8.0-alpine -ENV PHP_CS_FIXER_VERISON 2.19.3 +ENV PHP_CS_FIXER_VERSION 2.19.3 # hadolint ignore=DL3018 -RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERISON/php-cs-fixer.phar -o php-cs-fixer \ +RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERSION/php-cs-fixer.phar -o php-cs-fixer \ && chmod +x php-cs-fixer \ && mv php-cs-fixer /usr/local/bin/php-cs-fixer diff --git a/3.12/Dockerfile b/3.12/Dockerfile index 6888789..744dedb 100644 --- a/3.12/Dockerfile +++ b/3.12/Dockerfile @@ -1,8 +1,8 @@ FROM php:8.2-alpine -ENV PHP_CS_FIXER_VERISON 3.12.0 +ENV PHP_CS_FIXER_VERSION 3.12.0 # hadolint ignore=DL3018 -RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERISON/php-cs-fixer.phar -o php-cs-fixer \ +RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERSION/php-cs-fixer.phar -o php-cs-fixer \ && chmod +x php-cs-fixer \ && mv php-cs-fixer /usr/local/bin/php-cs-fixer diff --git a/3.13/Dockerfile b/3.13/Dockerfile index 4aa94f8..5dbea01 100644 --- a/3.13/Dockerfile +++ b/3.13/Dockerfile @@ -1,8 +1,8 @@ FROM php:8.2-alpine -ENV PHP_CS_FIXER_VERISON 3.13.2 +ENV PHP_CS_FIXER_VERSION 3.13.2 # hadolint ignore=DL3018 -RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERISON/php-cs-fixer.phar -o php-cs-fixer \ +RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERSION/php-cs-fixer.phar -o php-cs-fixer \ && chmod +x php-cs-fixer \ && mv php-cs-fixer /usr/local/bin/php-cs-fixer diff --git a/3/Dockerfile b/3/Dockerfile index 2a6fb1d..d5e1025 100644 --- a/3/Dockerfile +++ b/3/Dockerfile @@ -1,8 +1,8 @@ FROM php:8-alpine -ENV PHP_CS_FIXER_VERISON 3.13.2 +ENV PHP_CS_FIXER_VERSION 3.13.2 # hadolint ignore=DL3018 -RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERISON/php-cs-fixer.phar -o php-cs-fixer \ +RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERSION/php-cs-fixer.phar -o php-cs-fixer \ && chmod +x php-cs-fixer \ && mv php-cs-fixer /usr/local/bin/php-cs-fixer diff --git a/Dockerfile.template b/Dockerfile.template index 50fa2b8..1e503c0 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,10 +1,10 @@ FROM php:%%PHP_VERSION%%-alpine -ENV PHP_CS_FIXER_VERISON %%VARIANT%% +ENV PHP_CS_FIXER_VERSION %%VARIANT%% # hadolint ignore=DL3018 -RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERISON/php-cs-fixer.phar -o php-cs-fixer \ +RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERSION/php-cs-fixer.phar -o php-cs-fixer \ #### - && curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERISON/php-cs-fixer.phar.asc -o php-cs-fixer.phar.asc \ + && curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v$PHP_CS_FIXER_VERSION/php-cs-fixer.phar.asc -o php-cs-fixer.phar.asc \ && apk add --no-cache --virtual .build-deps gnupg \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-key BBAB5DF0A0D6672989CF1869E82B2FB314E9906E \ && gpg --verify php-cs-fixer.phar.asc php-cs-fixer \ From bcc74cbbf80ad0e12e1d45d405fb9aa76065870b Mon Sep 17 00:00:00 2001 From: Michael Stucki Date: Tue, 24 Jan 2023 10:38:36 +0100 Subject: [PATCH 2/2] Downgrade to supported PHP versions According to https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/6749 PHP 8.2 is currently not supported. --- 3.12/Dockerfile | 2 +- 3.13/Dockerfile | 2 +- 3/Dockerfile | 2 +- update.sh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/3.12/Dockerfile b/3.12/Dockerfile index 744dedb..ceaa787 100644 --- a/3.12/Dockerfile +++ b/3.12/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-alpine +FROM php:8.1-alpine ENV PHP_CS_FIXER_VERSION 3.12.0 # hadolint ignore=DL3018 diff --git a/3.13/Dockerfile b/3.13/Dockerfile index 5dbea01..0879a75 100644 --- a/3.13/Dockerfile +++ b/3.13/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-alpine +FROM php:8.1-alpine ENV PHP_CS_FIXER_VERSION 3.13.2 # hadolint ignore=DL3018 diff --git a/3/Dockerfile b/3/Dockerfile index d5e1025..a9069af 100644 --- a/3/Dockerfile +++ b/3/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8-alpine +FROM php:8.0-alpine ENV PHP_CS_FIXER_VERSION 3.13.2 # hadolint ignore=DL3018 diff --git a/update.sh b/update.sh index da7fbbd..4843d3d 100755 --- a/update.sh +++ b/update.sh @@ -12,9 +12,9 @@ declare -A variants=( ) declare -A php_version=( - ['3']='8' - ['3.13']='8.2' - ['3.12']='8.2' + ['3']='8.0' + ['3.13']='8.1' + ['3.12']='8.1' ['2']='8.0' ['2.19']='8.0' ['1']='7.1'