Skip to content

Commit e902a5d

Browse files
author
Hans Höchtl
authored
Merge pull request #487 from schliflo/bugfix/broken-dockerfiles
[BUGFIX] re-add missing slashes and remove some trailing whitespaces
2 parents e18106b + e7bcc40 commit e902a5d

File tree

17 files changed

+49
-49
lines changed

17 files changed

+49
-49
lines changed

‎docker/php-official/5.6/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ RUN set -x \
135135
&& cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
136136
&& rm -rf master.zip guetzli-master \
137137
# Install new version of ICU
138-
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
138+
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
139139
&& tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
140140
# Install extensions
141141
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
@@ -160,7 +160,7 @@ RUN set -x \
160160
pdo_pgsql \
161161
pgsql \
162162
soap \
163-
sockets \
163+
sockets \
164164
tokenizer \
165165
sysvmsg \
166166
sysvsem \

‎docker/php-official/7.0/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ RUN set -x \
135135
&& cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
136136
&& rm -rf master.zip guetzli-master \
137137
# Install new version of ICU
138-
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
138+
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
139139
&& tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
140140
# Install extensions
141141
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
@@ -160,7 +160,7 @@ RUN set -x \
160160
pdo_pgsql \
161161
pgsql \
162162
soap \
163-
sockets \
163+
sockets \
164164
tokenizer \
165165
sysvmsg \
166166
sysvsem \

‎docker/php-official/7.1-alpine/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \
2222
APPLICATION_PATH=/app \
2323
APPLICATION_UID=1000 \
2424
APPLICATION_GID=1000
25-
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
25+
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
2626
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
2727
ENV COMPOSER_VERSION="2"
2828

@@ -142,7 +142,7 @@ RUN set -x \
142142
# https://github.com/docker-library/php/issues/240
143143
&& apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \
144144
# Install new version of ICU
145-
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
145+
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
146146
&& tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
147147
# Install extensions
148148
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
@@ -166,8 +166,8 @@ RUN set -x \
166166
pdo_pgsql \
167167
pgsql \
168168
soap \
169-
sockets \
170-
tokenizer \
169+
sockets \
170+
tokenizer \
171171
sysvmsg \
172172
sysvsem \
173173
sysvshm \

‎docker/php-official/7.1/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ RUN set -x \
135135
&& cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
136136
&& rm -rf master.zip guetzli-master \
137137
# Install new version of ICU
138-
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
138+
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
139139
&& tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
140140
# Install extensions
141141
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
@@ -160,7 +160,7 @@ RUN set -x \
160160
pdo_pgsql \
161161
pgsql \
162162
soap \
163-
sockets \
163+
sockets \
164164
tokenizer \
165165
sysvmsg \
166166
sysvsem \

‎docker/php-official/7.2-alpine/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \
2222
APPLICATION_PATH=/app \
2323
APPLICATION_UID=1000 \
2424
APPLICATION_GID=1000
25-
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
25+
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
2626
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
2727
ENV COMPOSER_VERSION="2"
2828

@@ -142,7 +142,7 @@ RUN set -x \
142142
# https://github.com/docker-library/php/issues/240
143143
&& apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \
144144
# Install new version of ICU
145-
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
145+
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
146146
&& tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
147147
# Install extensions
148148
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
@@ -166,8 +166,8 @@ RUN set -x \
166166
pdo_pgsql \
167167
pgsql \
168168
soap \
169-
sockets \
170-
tokenizer \
169+
sockets \
170+
tokenizer \
171171
sysvmsg \
172172
sysvsem \
173173
sysvshm \

‎docker/php-official/7.2/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ RUN set -x \
135135
&& cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
136136
&& rm -rf master.zip guetzli-master \
137137
# Install new version of ICU
138-
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
138+
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
139139
&& tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
140140
# Install extensions
141141
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
@@ -159,7 +159,7 @@ RUN set -x \
159159
pdo_pgsql \
160160
pgsql \
161161
soap \
162-
sockets \
162+
sockets \
163163
tokenizer \
164164
sysvmsg \
165165
sysvsem \

‎docker/php-official/7.3-alpine/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \
2222
APPLICATION_PATH=/app \
2323
APPLICATION_UID=1000 \
2424
APPLICATION_GID=1000
25-
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
25+
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
2626
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
2727
ENV COMPOSER_VERSION="2"
2828

@@ -142,7 +142,7 @@ RUN set -x \
142142
# https://github.com/docker-library/php/issues/240
143143
&& apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \
144144
# Install new version of ICU
145-
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
145+
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
146146
&& tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
147147
# Install extensions
148148
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
@@ -166,8 +166,8 @@ RUN set -x \
166166
pdo_pgsql \
167167
pgsql \
168168
soap \
169-
sockets \
170-
tokenizer \
169+
sockets \
170+
tokenizer \
171171
sysvmsg \
172172
sysvsem \
173173
sysvshm \

‎docker/php-official/7.3/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ RUN set -x \
135135
&& cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
136136
&& rm -rf master.zip guetzli-master \
137137
# Install new version of ICU
138-
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
138+
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
139139
&& tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
140140
# Install extensions
141141
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
@@ -159,7 +159,7 @@ RUN set -x \
159159
pdo_pgsql \
160160
pgsql \
161161
soap \
162-
sockets \
162+
sockets \
163163
tokenizer \
164164
sysvmsg \
165165
sysvsem \

‎docker/php-official/7.4-alpine/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ENV APPLICATION_USER=application \
2222
APPLICATION_PATH=/app \
2323
APPLICATION_UID=1000 \
2424
APPLICATION_GID=1000
25-
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
25+
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
2626
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
2727
ENV COMPOSER_VERSION="2"
2828

@@ -142,7 +142,7 @@ RUN set -x \
142142
# https://github.com/docker-library/php/issues/240
143143
&& apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \
144144
# Install new version of ICU
145-
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
145+
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
146146
&& tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
147147
# Install extensions
148148
&& PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
@@ -171,8 +171,8 @@ RUN set -x \
171171
pdo_pgsql \
172172
pgsql \
173173
soap \
174-
sockets \
175-
tokenizer \
174+
sockets \
175+
tokenizer \
176176
sysvmsg \
177177
sysvsem \
178178
sysvshm \

‎docker/php-official/7.4/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ RUN set -x \
135135
&& cp guetzli-master/bin/Release/guetzli /usr/local/bin/ \
136136
&& rm -rf master.zip guetzli-master \
137137
# Install new version of ICU
138-
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
138+
&& curl -sS -o /tmp/icu.tar.gz -L https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz \
139139
&& tar -zxf /tmp/icu.tar.gz -C /tmp && cd /tmp/icu/source && ./configure --prefix=/usr/local && make && make install && cd / && rm -rf /tmp/icu* \
140140
# Install extensions
141141
&& PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
@@ -158,7 +158,7 @@ RUN set -x \
158158
pdo_pgsql \
159159
pgsql \
160160
soap \
161-
sockets \
161+
sockets \
162162
tokenizer \
163163
sysvmsg \
164164
sysvsem \

0 commit comments

Comments
 (0)