diff --git a/environments/native/php@5.6/cli/Dockerfile b/environments/native/php@5.6/cli/Dockerfile index 5cf82f8..e8c1a19 100644 --- a/environments/native/php@5.6/cli/Dockerfile +++ b/environments/native/php@5.6/cli/Dockerfile @@ -26,7 +26,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ @@ -55,7 +55,7 @@ RUN set -ex \ && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ - && php composer-setup.php --install-dir /usr/local/bin --filename composer --version=1.10.16 \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --1 \ && php -r "unlink('composer-setup.php');" \ && mkdir -p /opt/${APP_USERNAME}/.npm \ && mkdir -p /opt/${APP_USERNAME}/.composer \ diff --git a/environments/native/php@5.6/fpm/Dockerfile b/environments/native/php@5.6/fpm/Dockerfile index 9fa5ee8..16bcd4b 100644 --- a/environments/native/php@5.6/fpm/Dockerfile +++ b/environments/native/php@5.6/fpm/Dockerfile @@ -25,7 +25,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ diff --git a/environments/native/php@7.1/cli/Dockerfile b/environments/native/php@7.1/cli/Dockerfile index fb95a8b..95c3861 100644 --- a/environments/native/php@7.1/cli/Dockerfile +++ b/environments/native/php@7.1/cli/Dockerfile @@ -26,7 +26,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ @@ -55,7 +55,7 @@ RUN set -ex \ && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ - && php composer-setup.php --install-dir /usr/local/bin --filename composer --version=1.10.16 \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --1 \ && php -r "unlink('composer-setup.php');" \ && mkdir -p /opt/${APP_USERNAME}/.npm \ && mkdir -p /opt/${APP_USERNAME}/.composer \ diff --git a/environments/native/php@7.1/fpm/Dockerfile b/environments/native/php@7.1/fpm/Dockerfile index 8198316..3d6d76d 100644 --- a/environments/native/php@7.1/fpm/Dockerfile +++ b/environments/native/php@7.1/fpm/Dockerfile @@ -25,7 +25,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ diff --git a/environments/native/php@7.2/cli/Dockerfile b/environments/native/php@7.2/cli/Dockerfile index 0afcf8b..1da77b8 100644 --- a/environments/native/php@7.2/cli/Dockerfile +++ b/environments/native/php@7.2/cli/Dockerfile @@ -26,7 +26,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ @@ -55,7 +55,7 @@ RUN set -ex \ && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ - && php composer-setup.php --install-dir /usr/local/bin --filename composer --version=1.10.16 \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --1 \ && php -r "unlink('composer-setup.php');" \ && mkdir -p /opt/${APP_USERNAME}/.npm \ && mkdir -p /opt/${APP_USERNAME}/.composer \ diff --git a/environments/native/php@7.2/fpm/Dockerfile b/environments/native/php@7.2/fpm/Dockerfile index 8a1c265..66111f6 100644 --- a/environments/native/php@7.2/fpm/Dockerfile +++ b/environments/native/php@7.2/fpm/Dockerfile @@ -25,7 +25,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ diff --git a/environments/native/php@7.3/cli/Dockerfile b/environments/native/php@7.3/cli/Dockerfile index f381975..0ba5bd1 100644 --- a/environments/native/php@7.3/cli/Dockerfile +++ b/environments/native/php@7.3/cli/Dockerfile @@ -26,7 +26,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ @@ -55,7 +55,7 @@ RUN set -ex \ && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ - && php composer-setup.php --install-dir /usr/local/bin --filename composer --version=1.10.16 \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --1 \ && php -r "unlink('composer-setup.php');" \ && mkdir -p /opt/${APP_USERNAME}/.npm \ && mkdir -p /opt/${APP_USERNAME}/.composer \ diff --git a/environments/native/php@7.3/fpm/Dockerfile b/environments/native/php@7.3/fpm/Dockerfile index e9dd7b8..e31800e 100644 --- a/environments/native/php@7.3/fpm/Dockerfile +++ b/environments/native/php@7.3/fpm/Dockerfile @@ -25,7 +25,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ diff --git a/environments/native/php@7.4/cli/Dockerfile b/environments/native/php@7.4/cli/Dockerfile index 618be0c..44078d8 100644 --- a/environments/native/php@7.4/cli/Dockerfile +++ b/environments/native/php@7.4/cli/Dockerfile @@ -26,7 +26,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ @@ -55,7 +55,7 @@ RUN set -ex \ && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ - && php composer-setup.php --install-dir /usr/local/bin --filename composer --version=1.10.16 \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --1 \ && php -r "unlink('composer-setup.php');" \ && mkdir -p /opt/${APP_USERNAME}/.npm \ && mkdir -p /opt/${APP_USERNAME}/.composer \ diff --git a/environments/native/php@7.4/fpm/Dockerfile b/environments/native/php@7.4/fpm/Dockerfile index 82d5831..200968b 100644 --- a/environments/native/php@7.4/fpm/Dockerfile +++ b/environments/native/php@7.4/fpm/Dockerfile @@ -25,7 +25,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ diff --git a/environments/native/php@8.0/cli/Dockerfile b/environments/native/php@8.0/cli/Dockerfile index 1a34d4f..aa38d08 100644 --- a/environments/native/php@8.0/cli/Dockerfile +++ b/environments/native/php@8.0/cli/Dockerfile @@ -26,7 +26,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ @@ -55,7 +55,7 @@ RUN set -ex \ && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ - && php composer-setup.php --install-dir /usr/local/bin --filename composer --version=1.10.16 \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --1 \ && php -r "unlink('composer-setup.php');" \ && mkdir -p /opt/${APP_USERNAME}/.npm \ && mkdir -p /opt/${APP_USERNAME}/.composer \ diff --git a/environments/native/php@8.0/fpm/Dockerfile b/environments/native/php@8.0/fpm/Dockerfile index f598934..c9fdae1 100644 --- a/environments/native/php@8.0/fpm/Dockerfile +++ b/environments/native/php@8.0/fpm/Dockerfile @@ -25,7 +25,7 @@ RUN set -ex \ && docker-php-ext-configure intl \ && docker-php-ext-install intl \ && apk del icu-dev \ - && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted \ + && apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/$(cat /etc/alpine-release)/community/ --allow-untrusted \ && apk del \ .build-deps \ gdbm \ diff --git a/environments/oroplatform/ce/4.2/php@7.3/Dockerfile b/environments/oroplatform/ce/4.2/php@7.3/Dockerfile index dae1d1c..9be6499 100644 --- a/environments/oroplatform/ce/4.2/php@7.3/Dockerfile +++ b/environments/oroplatform/ce/4.2/php@7.3/Dockerfile @@ -32,4 +32,10 @@ RUN set -ex \ && docker-php-ext-install imap \ && docker-php-source delete \ && apk del .build-deps \ - && rm -rf /tmp/* /var/cache/apk/* + && rm -rf /tmp/* /var/cache/apk/* \ + && EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" \ + && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ + && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ + && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --2 \ + && php -r "unlink('composer-setup.php');" \ diff --git a/environments/oroplatform/ce/4.2/php@7.4/Dockerfile b/environments/oroplatform/ce/4.2/php@7.4/Dockerfile index 50bf3c6..ac6d6cc 100644 --- a/environments/oroplatform/ce/4.2/php@7.4/Dockerfile +++ b/environments/oroplatform/ce/4.2/php@7.4/Dockerfile @@ -32,4 +32,10 @@ RUN set -ex \ && docker-php-ext-install imap \ && docker-php-source delete \ && apk del .build-deps \ - && rm -rf /tmp/* /var/cache/apk/* + && rm -rf /tmp/* /var/cache/apk/* \ + && EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" \ + && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ + && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ + && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --2 \ + && php -r "unlink('composer-setup.php');" \ diff --git a/environments/oroplatform/ce/4.2/php@8.0/Dockerfile b/environments/oroplatform/ce/4.2/php@8.0/Dockerfile index 64fc799..296b5a4 100644 --- a/environments/oroplatform/ce/4.2/php@8.0/Dockerfile +++ b/environments/oroplatform/ce/4.2/php@8.0/Dockerfile @@ -30,4 +30,10 @@ RUN set -ex \ && docker-php-ext-install imap \ && docker-php-source delete \ && apk del .build-deps \ - && rm -rf /tmp/* /var/cache/apk/* + && rm -rf /tmp/* /var/cache/apk/* \ + && EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" \ + && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ + && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ + && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --2 \ + && php -r "unlink('composer-setup.php');" \