Skip to content

Commit

Permalink
Added Composer 2 for Oro 4.2
Browse files Browse the repository at this point in the history 
Fixed an issue in the iconv support
  • Loading branch information
@gplanchat
gplanchat committed Mar 19, 2021
1 parent ca5fe7b commit bdff44d
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 21 deletions.
4 changes: 2 additions & 2 deletions environments/native/php@5.6/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion environments/native/php@5.6/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions environments/native/php@7.1/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion environments/native/php@7.1/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions environments/native/php@7.2/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion environments/native/php@7.2/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions environments/native/php@7.3/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion environments/native/php@7.3/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions environments/native/php@7.4/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion environments/native/php@7.4/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions environments/native/php@8.0/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion environments/native/php@8.0/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
8 changes: 7 additions & 1 deletion environments/oroplatform/ce/4.2/php@7.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');" \
8 changes: 7 additions & 1 deletion environments/oroplatform/ce/4.2/php@7.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');" \
8 changes: 7 additions & 1 deletion environments/oroplatform/ce/4.2/php@8.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');" \

0 comments on commit bdff44d

Please sign in to comment.