Skip to content

Commit 4925e33

Browse files
committed
chore: update
1 parent 70f544c commit 4925e33

File tree

5 files changed

+109
-118
lines changed

5 files changed

+109
-118
lines changed

7.0/Dockerfile

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
FROM alpine:3.13
1+
FROM alpine:3.16
22
LABEL maintainer="Shion <shion.chow@gmail.com>"
33

44
ENV PHP_VERSION 7.0.33
5-
ENV PHP_MEMCACHED_VERSION 3.2.0
6-
ENV PHP_REDIS_VERSION 5.3.7
7-
ENV PHP_MONGODB_VERSION 1.16.1
8-
ENV PHP_IMAGICK_VERSION 3.7.0
5+
ENV PHP_MONGODB_VERSION 1.9.2
96

107
ENV BUILD_TOOLS \
118
curl \
@@ -16,39 +13,40 @@ ENV BUILD_TOOLS \
1613

1714
ENV BUILD_DEPS \
1815
libxml2-dev \
19-
curl-dev gd-dev \
16+
curl-dev \
17+
libwebp-dev \
18+
libjpeg-turbo-dev \
19+
libpng-dev \
20+
libxpm-dev \
21+
freetype-dev \
2022
gettext-dev \
2123
gmp-dev \
2224
libmcrypt-dev \
2325
postgresql-dev \
2426
libedit-dev \
2527
libzip-dev \
26-
libxpm-dev \
2728
libmemcached-dev \
2829
imagemagick-dev
2930

3031
ENV RUNTIME_DEPS \
32+
libzip \
33+
libedit \
3134
libpq \
32-
gmp \
3335
libmcrypt \
34-
gettext-libs \
35-
libxml2 \
36-
libcurl \
36+
libintl \
37+
libxpm \
3738
libpng \
38-
libwebp \
3939
libjpeg-turbo \
40-
libxpm \
40+
libwebp \
41+
libxml2 \
4142
freetype \
42-
libedit \
43-
libzip \
4443
libmemcached \
4544
icu-libs \
4645
imagemagick
4746

4847
ENV PHP_INI_DIR /usr/local/etc/php
4948

50-
# 82 is the standard uid/gid for "www-data" in Alpine
51-
RUN addgroup -g 82 -S www-data && adduser -u 82 -D -H -S -G www-data www-data
49+
RUN adduser -u 82 -D -H -S -G www-data www-data
5250

5351
# https://github.com/docker-library/php/issues/272
5452
RUN export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
@@ -66,8 +64,8 @@ RUN apk add --no-cache --virtual .build-tools $BUILD_TOOLS \
6664
&& tar -zxf php.tar.gz \
6765
&& cd php-${PHP_VERSION} \
6866
&& ./configure \
69-
--with-config-file-path="$PHP_INI_DIR" \
70-
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
67+
--with-config-file-path=$PHP_INI_DIR \
68+
--with-config-file-scan-dir=$PHP_INI_DIR/conf.d \
7169
--enable-fpm \
7270
--with-fpm-user=www-data \
7371
--with-fpm-group=www-data \
@@ -110,27 +108,27 @@ RUN apk add --no-cache --virtual .build-tools $BUILD_TOOLS \
110108
&& echo "zend_extension=opcache.so" >> $PHP_INI_DIR/conf.d/opcache.ini \
111109
# memcached
112110
&& cd /usr/src \
113-
&& curl -o memcached.tar.gz -L https://github.com/php-memcached-dev/php-memcached/archive/v${PHP_MEMCACHED_VERSION}.tar.gz \
111+
&& curl -o memcached.tar.gz -L https://pecl.php.net/get/memcached \
114112
&& tar -zxvf memcached.tar.gz \
115-
&& cd php-memcached-${PHP_MEMCACHED_VERSION} \
113+
&& cd memcached-* \
116114
&& phpize \
117115
&& ./configure --enable-memcached-json --disable-memcached-sasl \
118116
&& make \
119117
&& make install \
120118
&& echo "extension=memcached.so" >> $PHP_INI_DIR/conf.d/memcached.ini \
121119
# redis
122120
&& cd /usr/src \
123-
&& curl -o redis.tar.gz -L https://github.com/phpredis/phpredis/archive/${PHP_REDIS_VERSION}.tar.gz \
121+
&& curl -o redis.tar.gz -L https://pecl.php.net/get/redis \
124122
&& tar -zxvf redis.tar.gz \
125-
&& cd phpredis-${PHP_REDIS_VERSION} \
123+
&& cd redis-* \
126124
&& phpize \
127125
&& ./configure \
128126
&& make \
129127
&& make install \
130128
&& echo "extension=redis.so" >> $PHP_INI_DIR/conf.d/redis.ini \
131129
# mongodb
132130
&& cd /usr/src \
133-
&& curl -o mongodb.tar.gz -L https://github.com/mongodb/mongo-php-driver/releases/download/${PHP_MONGODB_VERSION}/mongodb-${PHP_MONGODB_VERSION}.tgz \
131+
&& curl -o mongodb.tar.gz -L https://pecl.php.net/get/mongodb-${PHP_MONGODB_VERSION}.tgz \
134132
&& tar -zxvf mongodb.tar.gz \
135133
&& cd mongodb-${PHP_MONGODB_VERSION} \
136134
&& phpize \
@@ -140,9 +138,9 @@ RUN apk add --no-cache --virtual .build-tools $BUILD_TOOLS \
140138
&& echo "extension=mongodb.so" >> $PHP_INI_DIR/conf.d/mongodb.ini \
141139
# imagick
142140
&& cd /usr/src \
143-
&& curl -o imagick.tar.gz -L https://pecl.php.net/get/imagick-${PHP_IMAGICK_VERSION}.tgz \
141+
&& curl -o imagick.tar.gz -L https://pecl.php.net/get/imagick \
144142
&& tar -zxvf imagick.tar.gz \
145-
&& cd imagick-${PHP_IMAGICK_VERSION} \
143+
&& cd imagick-* \
146144
&& phpize \
147145
&& ./configure \
148146
&& make \

7.1/Dockerfile

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
FROM alpine:3.13
1+
FROM alpine:3.16
22
LABEL maintainer="Shion <shion.chow@gmail.com>"
33

44
ENV PHP_VERSION 7.1.33
5-
ENV PHP_MEMCACHED_VERSION 3.2.0
6-
ENV PHP_REDIS_VERSION 5.3.7
7-
ENV PHP_MONGODB_VERSION 1.16.1
8-
ENV PHP_IMAGICK_VERSION 3.7.0
5+
ENV PHP_MONGODB_VERSION 1.11.1
96

107
ENV BUILD_TOOLS \
118
curl \
@@ -16,39 +13,40 @@ ENV BUILD_TOOLS \
1613

1714
ENV BUILD_DEPS \
1815
libxml2-dev \
19-
curl-dev gd-dev \
16+
curl-dev \
17+
libwebp-dev \
18+
libjpeg-turbo-dev \
19+
libpng-dev \
20+
libxpm-dev \
21+
freetype-dev \
2022
gettext-dev \
2123
gmp-dev \
2224
libmcrypt-dev \
2325
postgresql-dev \
2426
libedit-dev \
2527
libzip-dev \
26-
libxpm-dev \
2728
libmemcached-dev \
2829
imagemagick-dev
2930

3031
ENV RUNTIME_DEPS \
32+
libzip \
33+
libedit \
3134
libpq \
32-
gmp \
3335
libmcrypt \
34-
gettext-libs \
35-
libxml2 \
36-
libcurl \
36+
libintl \
37+
libxpm \
3738
libpng \
38-
libwebp \
3939
libjpeg-turbo \
40-
libxpm \
40+
libwebp \
41+
libxml2 \
4142
freetype \
42-
libedit \
43-
libzip \
4443
libmemcached \
4544
icu-libs \
4645
imagemagick
4746

4847
ENV PHP_INI_DIR /usr/local/etc/php
4948

50-
# 82 is the standard uid/gid for "www-data" in Alpine
51-
RUN addgroup -g 82 -S www-data && adduser -u 82 -D -H -S -G www-data www-data
49+
RUN adduser -u 82 -D -H -S -G www-data www-data
5250

5351
# https://github.com/docker-library/php/issues/272
5452
RUN export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
@@ -66,8 +64,8 @@ RUN apk add --no-cache --virtual .build-tools $BUILD_TOOLS \
6664
&& tar -zxf php.tar.gz \
6765
&& cd php-${PHP_VERSION} \
6866
&& ./configure \
69-
--with-config-file-path="$PHP_INI_DIR" \
70-
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
67+
--with-config-file-path=$PHP_INI_DIR \
68+
--with-config-file-scan-dir=$PHP_INI_DIR/conf.d \
7169
--enable-fpm \
7270
--with-fpm-user=www-data \
7371
--with-fpm-group=www-data \
@@ -110,27 +108,27 @@ RUN apk add --no-cache --virtual .build-tools $BUILD_TOOLS \
110108
&& echo "zend_extension=opcache.so" >> $PHP_INI_DIR/conf.d/opcache.ini \
111109
# memcached
112110
&& cd /usr/src \
113-
&& curl -o memcached.tar.gz -L https://github.com/php-memcached-dev/php-memcached/archive/v${PHP_MEMCACHED_VERSION}.tar.gz \
111+
&& curl -o memcached.tar.gz -L https://pecl.php.net/get/memcached \
114112
&& tar -zxvf memcached.tar.gz \
115-
&& cd php-memcached-${PHP_MEMCACHED_VERSION} \
113+
&& cd memcached-* \
116114
&& phpize \
117115
&& ./configure --enable-memcached-json --disable-memcached-sasl \
118116
&& make \
119117
&& make install \
120118
&& echo "extension=memcached.so" >> $PHP_INI_DIR/conf.d/memcached.ini \
121119
# redis
122120
&& cd /usr/src \
123-
&& curl -o redis.tar.gz -L https://github.com/phpredis/phpredis/archive/${PHP_REDIS_VERSION}.tar.gz \
121+
&& curl -o redis.tar.gz -L https://pecl.php.net/get/redis \
124122
&& tar -zxvf redis.tar.gz \
125-
&& cd phpredis-${PHP_REDIS_VERSION} \
123+
&& cd redis-* \
126124
&& phpize \
127125
&& ./configure \
128126
&& make \
129127
&& make install \
130128
&& echo "extension=redis.so" >> $PHP_INI_DIR/conf.d/redis.ini \
131129
# mongodb
132130
&& cd /usr/src \
133-
&& curl -o mongodb.tar.gz -L https://github.com/mongodb/mongo-php-driver/releases/download/${PHP_MONGODB_VERSION}/mongodb-${PHP_MONGODB_VERSION}.tgz \
131+
&& curl -o mongodb.tar.gz -L https://pecl.php.net/get/mongodb-${PHP_MONGODB_VERSION}.tgz \
134132
&& tar -zxvf mongodb.tar.gz \
135133
&& cd mongodb-${PHP_MONGODB_VERSION} \
136134
&& phpize \
@@ -140,9 +138,9 @@ RUN apk add --no-cache --virtual .build-tools $BUILD_TOOLS \
140138
&& echo "extension=mongodb.so" >> $PHP_INI_DIR/conf.d/mongodb.ini \
141139
# imagick
142140
&& cd /usr/src \
143-
&& curl -o imagick.tar.gz -L https://pecl.php.net/get/imagick-${PHP_IMAGICK_VERSION}.tgz \
141+
&& curl -o imagick.tar.gz -L https://pecl.php.net/get/imagick \
144142
&& tar -zxvf imagick.tar.gz \
145-
&& cd imagick-${PHP_IMAGICK_VERSION} \
143+
&& cd imagick-* \
146144
&& phpize \
147145
&& ./configure \
148146
&& make \
@@ -155,4 +153,4 @@ VOLUME ["/app"]
155153
WORKDIR /app
156154

157155
EXPOSE 9000
158-
CMD ["php-fpm"]
156+
CMD ["php-fpm"]

7.2/Dockerfile

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
FROM alpine:3.13
1+
FROM alpine:3.16
22
LABEL maintainer="Shion <shion.chow@gmail.com>"
33

44
ENV PHP_VERSION 7.2.34
5-
ENV PHP_MEMCACHED_VERSION 3.2.0
6-
ENV PHP_REDIS_VERSION 5.3.7
7-
ENV PHP_MONGODB_VERSION 1.16.1
8-
ENV PHP_IMAGICK_VERSION 3.7.0
95

106
ENV BUILD_TOOLS \
117
curl \
@@ -17,37 +13,37 @@ ENV BUILD_TOOLS \
1713
ENV BUILD_DEPS \
1814
libxml2-dev \
1915
curl-dev \
20-
gd-dev \
16+
libwebp-dev \
17+
libjpeg-turbo-dev \
18+
libpng-dev \
19+
libxpm-dev \
20+
freetype-dev \
2121
gettext-dev \
2222
gmp-dev \
2323
postgresql-dev \
2424
libedit-dev \
2525
libzip-dev \
26-
libxpm-dev \
2726
libmemcached-dev \
2827
imagemagick-dev
2928

3029
ENV RUNTIME_DEPS \
31-
libpq \
32-
gmp \
33-
gettext-libs \
3430
libxml2 \
35-
libcurl \
36-
libpng \
3731
libwebp \
3832
libjpeg-turbo \
33+
libpng \
3934
libxpm \
4035
freetype \
36+
libintl \
4137
libedit \
4238
libzip \
39+
libpq \
40+
imagemagick-libs \
4341
libmemcached \
44-
icu-libs \
45-
imagemagick
42+
icu-libs
4643

4744
ENV PHP_INI_DIR /usr/local/etc/php
4845

49-
# 82 is the standard uid/gid for "www-data" in Alpine
50-
RUN addgroup -g 82 -S www-data && adduser -u 82 -D -H -S -G www-data www-data
46+
RUN adduser -u 82 -D -H -S -G www-data www-data
5147

5248
# https://github.com/docker-library/php/issues/272
5349
RUN export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
@@ -57,16 +53,17 @@ RUN export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
5753

5854
RUN apk add --no-cache --virtual .build-tools $BUILD_TOOLS \
5955
&& apk add --no-cache --virtual .build-deps $BUILD_DEPS \
60-
&& apk add --no-cache --virtual .runtime-deps $RUNTIME_DEPS \
61-
&& mkdir -p $PHP_INI_DIR/conf.d \
56+
&& apk add --no-cache --virtual .runtime-deps $RUNTIME_DEPS
57+
58+
RUN mkdir -p $PHP_INI_DIR/conf.d \
6259
&& mkdir -p /usr/src \
6360
&& cd /usr/src \
64-
&& curl -o php.tar.gz -L https://php.net/get/php-${PHP_VERSION}.tar.gz/from/this/mirror \
61+
&& curl -o php.tar.gz -L https://www.php.net/distributions/php-${PHP_VERSION}.tar.gz \
6562
&& tar -zxf php.tar.gz \
6663
&& cd php-${PHP_VERSION} \
6764
&& ./configure \
68-
--with-config-file-path="$PHP_INI_DIR" \
69-
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
65+
--with-config-file-path=$PHP_INI_DIR \
66+
--with-config-file-scan-dir=$PHP_INI_DIR/conf.d \
7067
--enable-fpm \
7168
--with-fpm-user=www-data \
7269
--with-fpm-group=www-data \
@@ -108,39 +105,39 @@ RUN apk add --no-cache --virtual .build-tools $BUILD_TOOLS \
108105
&& echo "zend_extension=opcache.so" >> $PHP_INI_DIR/conf.d/opcache.ini \
109106
# memcached
110107
&& cd /usr/src \
111-
&& curl -o memcached.tar.gz -L https://github.com/php-memcached-dev/php-memcached/archive/v${PHP_MEMCACHED_VERSION}.tar.gz \
108+
&& curl -o memcached.tar.gz -L https://pecl.php.net/get/memcached \
112109
&& tar -zxvf memcached.tar.gz \
113-
&& cd php-memcached-${PHP_MEMCACHED_VERSION} \
110+
&& cd memcached-* \
114111
&& phpize \
115112
&& ./configure --enable-memcached-json --disable-memcached-sasl \
116113
&& make \
117114
&& make install \
118115
&& echo "extension=memcached.so" >> $PHP_INI_DIR/conf.d/memcached.ini \
119116
# redis
120117
&& cd /usr/src \
121-
&& curl -o redis.tar.gz -L https://github.com/phpredis/phpredis/archive/${PHP_REDIS_VERSION}.tar.gz \
118+
&& curl -o redis.tar.gz -L https://pecl.php.net/get/redis \
122119
&& tar -zxvf redis.tar.gz \
123-
&& cd phpredis-${PHP_REDIS_VERSION} \
120+
&& cd redis-* \
124121
&& phpize \
125122
&& ./configure \
126123
&& make \
127124
&& make install \
128125
&& echo "extension=redis.so" >> $PHP_INI_DIR/conf.d/redis.ini \
129126
# mongodb
130127
&& cd /usr/src \
131-
&& curl -o mongodb.tar.gz -L https://github.com/mongodb/mongo-php-driver/releases/download/${PHP_MONGODB_VERSION}/mongodb-${PHP_MONGODB_VERSION}.tgz \
128+
&& curl -o mongodb.tar.gz -L https://pecl.php.net/get/mongodb \
132129
&& tar -zxvf mongodb.tar.gz \
133-
&& cd mongodb-${PHP_MONGODB_VERSION} \
130+
&& cd mongodb-* \
134131
&& phpize \
135132
&& ./configure \
136133
&& make \
137134
&& make install \
138135
&& echo "extension=mongodb.so" >> $PHP_INI_DIR/conf.d/mongodb.ini \
139136
# imagick
140137
&& cd /usr/src \
141-
&& curl -o imagick.tar.gz -L https://pecl.php.net/get/imagick-${PHP_IMAGICK_VERSION}.tgz \
138+
&& curl -o imagick.tar.gz -L https://pecl.php.net/get/imagick \
142139
&& tar -zxvf imagick.tar.gz \
143-
&& cd imagick-${PHP_IMAGICK_VERSION} \
140+
&& cd imagick-* \
144141
&& phpize \
145142
&& ./configure \
146143
&& make \

0 commit comments

Comments
 (0)