Skip to content

Commit fbb8158

Browse files
TeakowaTeakowa
committed
Update Dockerfile
Update composer to 1.9.1
1 parent 85c49f2 commit fbb8158

File tree

1 file changed

+77
-71
lines changed

1 file changed

+77
-71
lines changed

‎Dockerfile

Lines changed: 77 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,27 @@ FROM alpine:3.10 as builder
22

33
ARG PHP_VERSION=7.3.11
44
ARG GPG_KEYS="CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D"
5-
ARG COMPOSER_VERSION=1.9.0
5+
ARG COMPOSER_VERSION=1.9.1
66

7-
RUN apk add --no-cache gnupg \
7+
RUN set -ex \
8+
&& apk upgrade \
9+
&& apk add --no-cache gnupg \
810
&& mkdir -p /usr/src \
911
&& cd /usr/src \
1012
&& wget -O php.tar.xz https://secure.php.net/get/php-$PHP_VERSION.tar.xz/from/this/mirror \
1113
&& wget -O php.tar.xz.asc https://secure.php.net/get/php-$PHP_VERSION.tar.xz.asc/from/this/mirror \
1214
&& export GNUPGHOME="$(mktemp -d)"; \
13-
for key in $GPG_KEYS; do \
14-
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
15-
done \
15+
for key in \
16+
CBAF69F173A0FEA4B537F470D66C9593118BCCB6 \
17+
F38252826ACD957EF380D39F2F7956BC5DA04B5D \
18+
; do \
19+
gpg --batch --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=10 --recv-keys "$key" || \
20+
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --keyserver-options timeout=10 --recv-keys "$key" || \
21+
gpg --batch --keyserver hkp://pgp.mit.edu:80 --keyserver-options timeout=10 --recv-keys "$key" ; \
22+
done \
1623
&& gpg --batch --verify php.tar.xz.asc php.tar.xz
1724

1825
COPY docker-php-source /usr/local/bin/
19-
ENV PHP_INI_DIR /usr/local/etc/php
2026

2127
RUN set -xe \
2228
&& apk add --no-cache \
@@ -75,9 +81,9 @@ RUN set -xe \
7581
\
7682
&& runDeps="$( \
7783
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
78-
| tr ',' '\n' \
79-
| sort -u \
80-
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
84+
| tr ',' '\n' \
85+
| sort -u \
86+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
8187
)" \
8288
&& apk add --no-cache $runDeps
8389

@@ -94,19 +100,19 @@ RUN (pickle install apcu -n --defaults || true) \
94100
&& ./configure \
95101
&& make -j$(getconf _NPROCESSORS_ONLN) \
96102
&& make install \
97-
&& docker-php-ext-enable apcu \
98-
&& (rm -rf /usr/local/lib/php/test/apcu || true) \
99-
&& (rm -rf /usr/local/lib/php/doc/apcu || true)
103+
&& docker-php-ext-enable apcu \
104+
&& (rm -rf /usr/local/lib/php/test/apcu || true) \
105+
&& (rm -rf /usr/local/lib/php/doc/apcu || true)
100106

101107
# bcmath
102108
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \
103-
&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
104-
&& (rm -rf /usr/local/lib/php/doc/bcmath || true)
109+
&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
110+
&& (rm -rf /usr/local/lib/php/doc/bcmath || true)
105111

106112
# exif
107113
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \
108-
&& (rm -rf /usr/local/lib/php/test/exif || true) \
109-
&& (rm -rf /usr/local/lib/php/doc/exif || true)
114+
&& (rm -rf /usr/local/lib/php/test/exif || true) \
115+
&& (rm -rf /usr/local/lib/php/doc/exif || true)
110116

111117
# gd
112118
RUN apk add --no-cache \
@@ -125,22 +131,22 @@ RUN apk add --no-cache \
125131
--with-freetype-dir=/usr \
126132
--enable-gd-jis-conv \
127133
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \
128-
&& (rm -rf /usr/local/lib/php/test/gd || true) \
129-
&& (rm -rf /usr/local/lib/php/doc/gd || true)
134+
&& (rm -rf /usr/local/lib/php/test/gd || true) \
135+
&& (rm -rf /usr/local/lib/php/doc/gd || true)
130136

131137
# gettext
132138
RUN apk add --no-cache \
133139
gettext-dev \
134140
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \
135-
&& (rm -rf /usr/local/lib/php/test/gettext || true) \
136-
&& (rm -rf /usr/local/lib/php/doc/gettext || true)
141+
&& (rm -rf /usr/local/lib/php/test/gettext || true) \
142+
&& (rm -rf /usr/local/lib/php/doc/gettext || true)
137143

138144
# gmp
139145
RUN apk add --no-cache \
140146
gmp-dev \
141147
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \
142-
&& (rm -rf /usr/local/lib/php/test/gmp || true) \
143-
&& (rm -rf /usr/local/lib/php/doc/gmp || true)
148+
&& (rm -rf /usr/local/lib/php/test/gmp || true) \
149+
&& (rm -rf /usr/local/lib/php/doc/gmp || true)
144150

145151
# imagick
146152
RUN apk add --no-cache \
@@ -152,15 +158,15 @@ RUN apk add --no-cache \
152158
&& make -j$(getconf _NPROCESSORS_ONLN) \
153159
&& make install \
154160
&& docker-php-ext-enable imagick \
155-
&& (rm -rf /usr/local/lib/php/test/imagick || true) \
156-
&& (rm -rf /usr/local/lib/php/doc/imagick || true)
161+
&& (rm -rf /usr/local/lib/php/test/imagick || true) \
162+
&& (rm -rf /usr/local/lib/php/doc/imagick || true)
157163

158164
# intl
159165
RUN apk add --no-cache \
160166
icu-dev \
161167
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \
162-
&& (rm -rf /usr/local/lib/php/test/intl || true) \
163-
&& (rm -rf /usr/local/lib/php/doc/intl || true)
168+
&& (rm -rf /usr/local/lib/php/test/intl || true) \
169+
&& (rm -rf /usr/local/lib/php/doc/intl || true)
164170

165171
# memcached
166172
RUN apk add --no-cache \
@@ -171,77 +177,77 @@ RUN apk add --no-cache \
171177
&& ./configure \
172178
&& make -j$(getconf _NPROCESSORS_ONLN) \
173179
&& make install \
174-
&& docker-php-ext-enable memcached \
175-
&& (rm -rf /usr/local/lib/php/test/memcached || true) \
176-
&& (rm -rf /usr/local/lib/php/doc/memcached || true)
180+
&& docker-php-ext-enable memcached \
181+
&& (rm -rf /usr/local/lib/php/test/memcached || true) \
182+
&& (rm -rf /usr/local/lib/php/doc/memcached || true)
177183

178184
# mysqli
179185
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
180-
&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
181-
&& (rm -rf /usr/local/lib/php/doc/mysqli || true)
186+
&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
187+
&& (rm -rf /usr/local/lib/php/doc/mysqli || true)
182188

183189
# opcache
184190
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
185-
&& (rm -rf /usr/local/lib/php/test/opcache || true) \
186-
&& (rm -rf /usr/local/lib/php/doc/opcache || true)
191+
&& (rm -rf /usr/local/lib/php/test/opcache || true) \
192+
&& (rm -rf /usr/local/lib/php/doc/opcache || true)
187193

188194
# pcntl
189195
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \
190-
&& (rm -rf /usr/local/lib/php/test/pcntl || true) \
191-
&& (rm -rf /usr/local/lib/php/doc/pcntl || true)
196+
&& (rm -rf /usr/local/lib/php/test/pcntl || true) \
197+
&& (rm -rf /usr/local/lib/php/doc/pcntl || true)
192198

193199
# pdo_mysql
194200
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
195-
&& (rm -rf /usr/local/lib/php/test/pdo_mysql || true) \
196-
&& (rm -rf /usr/local/lib/php/doc/pdo_mysql || true)
201+
&& (rm -rf /usr/local/lib/php/test/pdo_mysql || true) \
202+
&& (rm -rf /usr/local/lib/php/doc/pdo_mysql || true)
197203

198204
# pdo_pgsql
199205
RUN apk add --no-cache \
200206
postgresql-dev \
201207
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \
202-
&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
203-
&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true)
208+
&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
209+
&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true)
204210

205211
# pgsql
206212
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \
207-
&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
208-
&& (rm -rf /usr/local/lib/php/doc/pgsql || true)
213+
&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
214+
&& (rm -rf /usr/local/lib/php/doc/pgsql || true)
209215

210216
# redis
211217
RUN (pickle install redis -n --defaults || true) \
212218
&& cd /tmp/redis/redis* \
213-
&& phpize \
219+
&& phpize \
214220
&& ./configure \
215221
&& make -j$(getconf _NPROCESSORS_ONLN) \
216222
&& make install \
217-
&& docker-php-ext-enable redis \
218-
&& (rm -rf /usr/local/lib/php/test/redis || true) \
219-
&& (rm -rf /usr/local/lib/php/doc/redis || true)
223+
&& docker-php-ext-enable redis \
224+
&& (rm -rf /usr/local/lib/php/test/redis || true) \
225+
&& (rm -rf /usr/local/lib/php/doc/redis || true)
220226

221227
# shmop
222228
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
223-
&& (rm -rf /usr/local/lib/php/test/shmop || true) \
224-
&& (rm -rf /usr/local/lib/php/doc/shmop || true)
229+
&& (rm -rf /usr/local/lib/php/test/shmop || true) \
230+
&& (rm -rf /usr/local/lib/php/doc/shmop || true)
225231

226232
# soap
227233
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \
228-
&& (rm -rf /usr/local/lib/php/test/soap || true) \
229-
&& (rm -rf /usr/local/lib/php/doc/soap || true)
234+
&& (rm -rf /usr/local/lib/php/test/soap || true) \
235+
&& (rm -rf /usr/local/lib/php/doc/soap || true)
230236

231237
# sockets
232238
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \
233-
&& (rm -rf /usr/local/lib/php/test/sockets || true) \
234-
&& (rm -rf /usr/local/lib/php/doc/sockets || true)
239+
&& (rm -rf /usr/local/lib/php/test/sockets || true) \
240+
&& (rm -rf /usr/local/lib/php/doc/sockets || true)
235241

236242
# sodium
237243
RUN docker-php-ext-enable sodium \
238-
&& (rm -rf /usr/local/lib/php/test/sodium || true) \
239-
&& (rm -rf /usr/local/lib/php/doc/sodium || true)
244+
&& (rm -rf /usr/local/lib/php/test/sodium || true) \
245+
&& (rm -rf /usr/local/lib/php/doc/sodium || true)
240246

241247
# swoole
242248
RUN (pickle install swoole -n --defaults || true) \
243249
&& cd /tmp/swoole/swoole* \
244-
&& phpize \
250+
&& phpize \
245251
&& ./configure \
246252
--enable-openssl \
247253
--enable-sockets \
@@ -250,40 +256,40 @@ RUN (pickle install swoole -n --defaults || true) \
250256
--enable-coroutine-postgresql \
251257
&& make -j$(getconf _NPROCESSORS_ONLN) \
252258
&& make install \
253-
&& docker-php-ext-enable swoole \
254-
&& (rm -rf /usr/local/lib/php/test/swoole || true) \
255-
&& (rm -rf /usr/local/lib/php/doc/swoole || true)
259+
&& docker-php-ext-enable swoole \
260+
&& (rm -rf /usr/local/lib/php/test/swoole || true) \
261+
&& (rm -rf /usr/local/lib/php/doc/swoole || true)
256262

257263
# sysvsem
258264
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \
259-
&& (rm -rf /usr/local/lib/php/test/sysvsem || true) \
260-
&& (rm -rf /usr/local/lib/php/doc/sysvsem || true)
265+
&& (rm -rf /usr/local/lib/php/test/sysvsem || true) \
266+
&& (rm -rf /usr/local/lib/php/doc/sysvsem || true)
261267

262268
# tidy
263269
RUN apk add --no-cache \
264270
tidyhtml-dev \
265271
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \
266-
&& (rm -rf /usr/local/lib/php/test/tidy || true) \
267-
&& (rm -rf /usr/local/lib/php/doc/tidy || true)
272+
&& (rm -rf /usr/local/lib/php/test/tidy || true) \
273+
&& (rm -rf /usr/local/lib/php/doc/tidy || true)
268274

269275
# xmlrpc
270276
RUN docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \
271-
&& (rm -rf /usr/local/lib/php/test/xmlrpc || true) \
272-
&& (rm -rf /usr/local/lib/php/doc/xmlrpc || true)
277+
&& (rm -rf /usr/local/lib/php/test/xmlrpc || true) \
278+
&& (rm -rf /usr/local/lib/php/doc/xmlrpc || true)
273279

274280
# xsl
275281
RUN apk add --no-cache \
276282
libxslt-dev \
277283
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \
278-
&& (rm -rf /usr/local/lib/php/test/xsl || true) \
279-
&& (rm -rf /usr/local/lib/php/doc/xsl || true)
284+
&& (rm -rf /usr/local/lib/php/test/xsl || true) \
285+
&& (rm -rf /usr/local/lib/php/doc/xsl || true)
280286

281287
# zip
282288
RUN apk add --no-cache \
283289
libzip-dev \
284290
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \
285-
&& (rm -rf /usr/local/lib/php/test/zip || true) \
286-
&& (rm -rf /usr/local/lib/php/doc/zip || true)
291+
&& (rm -rf /usr/local/lib/php/test/zip || true) \
292+
&& (rm -rf /usr/local/lib/php/doc/zip || true)
287293

288294
# composer
289295
RUN wget -O /usr/local/bin/composer https://getcomposer.org/download/$COMPOSER_VERSION/composer.phar \
@@ -298,12 +304,12 @@ FROM alpine:3.10
298304

299305
COPY --from=builder /usr/local/ /usr/local/
300306

301-
RUN set -x \
307+
RUN set -ex \
302308
&& runDeps="$( \
303309
scanelf --needed --nobanner --format '%n#p' --recursive /usr/ \
304-
| tr ',' '\n' \
305-
| sort -u \
306-
| awk 'system("[ -e /usr/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
310+
| tr ',' '\n' \
311+
| sort -u \
312+
| awk 'system("[ -e /usr/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
307313
)" \
308314
&& apk --no-cache add $runDeps \
309315
&& addgroup -g 48 -S www-data \

0 commit comments

Comments
 (0)