Skip to content

Commit 19edd4f

Browse files
alquercialquerci
committed
fix(test): make php 5.3 consistent with others
1 parent ce3d214 commit 19edd4f

File tree

6 files changed

+196
-109
lines changed

6 files changed

+196
-109
lines changed

‎.docker/php53/Dockerfile

+85-10
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ RUN set -eux; \
1212

1313
# php 5.3 needs older autoconf
1414
RUN set -eux; \
15+
\
16+
buildDeps=' \
17+
autoconf2.13 \
18+
'; \
1519
\
1620
apt-get update; \
1721
apt-get install -y --force-yes --no-upgrade --no-install-recommends \
1822
curl \
19-
autoconf2.13 \
23+
$buildDeps \
2024
; \
2125
rm -r /var/lib/apt/lists/*; \
2226
\
@@ -37,38 +41,67 @@ RUN set -eux; \
3741
./buildconf --force; \
3842
./configure --disable-cgi \
3943
$(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \
44+
--with-config-file-path=/usr/local/etc/php \
45+
--with-config-file-scan-dir=/usr/local/etc/php/conf.d \
46+
--with-libdir=lib/x86_64-linux-gnu \
4047
--with-pdo-mysql \
4148
--with-zlib \
49+
--enable-zip \
4250
--enable-mbstring \
4351
--with-openssl=/usr \
44-
--with-libdir=lib/x86_64-linux-gnu \
52+
--enable-mysqlnd \
53+
--with-curl \
54+
--with-readline \
55+
--enable-ftp \
4556
; \
4657
make -j"$(nproc)"; \
4758
make install; \
59+
install -d /usr/local/etc/php/conf.d; \
4860
\
4961
dpkg -r \
5062
bison \
5163
libbison-dev \
5264
; \
53-
apt-get purge -y --force-yes --auto-remove \
54-
autoconf2.13 \
65+
apt-get purge -y --force-yes --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
66+
$buildDeps \
5567
; \
56-
rm -r /usr/src/php
68+
rm -r /usr/src/php; \
69+
apt-get clean; \
70+
rm -rf /var/lib/apt/lists/*; \
71+
rm -r /tmp/pear; \
72+
:;
73+
74+
RUN set -eux; \
75+
{ \
76+
echo '#! /bin/sh -eu'; \
77+
echo ''; \
78+
echo 'echo "extension=${1}.so" > "/usr/local/etc/php/conf.d/docker-php-ext-${1}.ini";'; \
79+
} | tee /usr/local/bin/docker-php-ext-enable; \
80+
\
81+
chmod +x /usr/local/bin/docker-php-ext-enable; \
82+
:;
5783

5884
CMD ["php", "-a"]
5985

6086
FROM php53
6187

6288
# Install APC PHP extension
6389
#
90+
ARG APC_VERSION
6491
RUN set -eux; \
6592
\
66-
packageName=APC; \
67-
packageVersion=3.1.13; \
93+
packageName=apc; \
94+
packageVersion=${APC_VERSION}; \
95+
packageFile=APC-${packageVersion}.tgz; \
6896
\
69-
packageFile=${packageName}-${packageVersion}.tgz; \
97+
if test x"3.1.13" = x"${packageVersion}"; then \
98+
packageSha256sum=5ef8ba07729e72946e95951672a5378bed98cb5a294e79bf0f0a97ac62829abd; \
99+
else :; fi; \
70100
\
71-
packageSha256sum=5ef8ba07729e72946e95951672a5378bed98cb5a294e79bf0f0a97ac62829abd; \
101+
if test x"" = x"${packageVersion}"; then \
102+
echo "Skip installation of ${packageName} PHP extension"; \
103+
return 0; \
104+
fi; \
72105
\
73106
curl --insecure -sSLfO https://pecl.php.net/get/${packageFile}; \
74107
echo "${packageSha256sum} ${packageFile}" \
@@ -77,11 +110,53 @@ RUN set -eux; \
77110
pecl install ${packageFile}; \
78111
rm ${packageFile}; \
79112
\
80-
echo "extension=apc.so" >> /usr/local/lib/php.ini; \
113+
docker-php-ext-enable ${packageName}; \
81114
\
82115
rm -r /tmp/pear; \
83116
:;
84117

118+
# Install memcache PHP extension
119+
#
120+
ARG MEMCACHE_VERSION
121+
RUN set -eux; \
122+
\
123+
packageName=memcache; \
124+
packageVersion=${MEMCACHE_VERSION}; \
125+
packageFile=${packageName}-${packageVersion}.tgz; \
126+
\
127+
if test x"3.0.8" = x"${packageVersion}"; then \
128+
packageSha256sum=2cae5b423ffbfd33a259829849f6000d4db018debe3e29ecf3056f06642e8311; \
129+
else :; fi; \
130+
\
131+
if test x"" = x"${packageVersion}"; then \
132+
echo "Skip installation of ${packageName} PHP extension"; \
133+
return 0; \
134+
fi; \
135+
\
136+
buildDeps=' \
137+
libzip-dev \
138+
'; \
139+
apt-get update; \
140+
apt-get install -y --force-yes --no-upgrade --no-install-recommends \
141+
$buildDeps \
142+
; \
143+
\
144+
curl --insecure -sSLfO https://pecl.php.net/get/${packageFile}; \
145+
echo "${packageSha256sum} ${packageFile}" \
146+
| sha256sum -cw --status; \
147+
\
148+
pecl install ${packageFile}; \
149+
rm ${packageFile}; \
150+
\
151+
docker-php-ext-enable ${packageName}; \
152+
\
153+
apt-get purge -y --force-yes --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
154+
$buildDeps \
155+
; \
156+
apt-get clean; \
157+
rm -rf /var/lib/apt/lists/*; \
158+
rm -r /tmp/pear
159+
85160
# Install composer
86161
#
87162
RUN set -eux; \

‎.docker/php54/Dockerfile

+28-12
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,21 @@ RUN docker-php-ext-install mbstring
2424

2525
# Install APC PHP extension
2626
#
27+
ARG APC_VERSION
2728
RUN set -eux; \
2829
\
29-
packageName=APC; \
30-
packageVersion=3.1.13; \
30+
packageName=apc; \
31+
packageVersion=${APC_VERSION}; \
32+
packageFile=APC-${packageVersion}.tgz; \
3133
\
32-
packageFile=${packageName}-${packageVersion}.tgz; \
34+
if test x"3.1.13" = x"${packageVersion}"; then \
35+
packageSha256sum=5ef8ba07729e72946e95951672a5378bed98cb5a294e79bf0f0a97ac62829abd; \
36+
else :; fi; \
3337
\
34-
packageSha256sum=5ef8ba07729e72946e95951672a5378bed98cb5a294e79bf0f0a97ac62829abd; \
38+
if test x"" = x"${packageVersion}"; then \
39+
echo "Skip installation of ${packageName} PHP extension"; \
40+
return 0; \
41+
fi; \
3542
\
3643
curl --insecure -sSLfO https://pecl.php.net/get/${packageFile}; \
3744
echo "${packageSha256sum} ${packageFile}" \
@@ -40,7 +47,7 @@ RUN set -eux; \
4047
pecl install ${packageFile}; \
4148
rm ${packageFile}; \
4249
\
43-
echo "extension=apc.so" >> /usr/local/lib/php.ini; \
50+
docker-php-ext-enable ${packageName}; \
4451
\
4552
rm -r /tmp/pear; \
4653
:;
@@ -50,10 +57,19 @@ RUN set -eux; \
5057
ARG MEMCACHE_VERSION
5158
RUN set -eux; \
5259
\
53-
if test x"3.0.8" = x"${MEMCACHE_VERSION}"; then \
54-
packageSha256sum=2cae5b423ffbfd33a259829849f6000d4db018debe3e29ecf3056f06642e8311; \
60+
packageName=memcache; \
61+
packageVersion=${MEMCACHE_VERSION}; \
62+
packageFile=${packageName}-${packageVersion}.tgz; \
63+
\
64+
if test x"3.0.8" = x"${packageVersion}"; then \
65+
packageSha256sum=2cae5b423ffbfd33a259829849f6000d4db018debe3e29ecf3056f06642e8311; \
5566
else :; fi; \
5667
\
68+
if test x"" = x"${packageVersion}"; then \
69+
echo "Skip installation of ${packageName} PHP extension"; \
70+
return 0; \
71+
fi; \
72+
\
5773
buildDeps=' \
5874
libzip-dev \
5975
'; \
@@ -62,14 +78,14 @@ RUN set -eux; \
6278
$buildDeps \
6379
; \
6480
\
65-
curl --insecure -sSLfO https://pecl.php.net/get/memcache-${MEMCACHE_VERSION}.tgz; \
66-
echo "${packageSha256sum} memcache-${MEMCACHE_VERSION}.tgz" \
81+
curl --insecure -sSLfO https://pecl.php.net/get/${packageFile}; \
82+
echo "${packageSha256sum} ${packageFile}" \
6783
| sha256sum -cw --status; \
6884
\
69-
pecl install memcache-${MEMCACHE_VERSION}.tgz; \
70-
rm memcache-${MEMCACHE_VERSION}.tgz; \
85+
pecl install ${packageFile}; \
86+
rm ${packageFile}; \
7187
\
72-
docker-php-ext-enable memcache; \
88+
docker-php-ext-enable ${packageName}; \
7389
\
7490
apt-get purge -y --force-yes --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
7591
$buildDeps \

‎.docker/php55_71/Dockerfile

+22-17
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,9 @@ RUN docker-php-ext-install mbstring
2727
#
2828
ARG APCU_VERSION
2929
RUN set -eux; \
30-
\
31-
if test x"" = x"${APCU_VERSION}"; then \
32-
return 0; \
33-
else :; fi; \
3430
\
3531
packageName=apcu; \
3632
packageVersion=${APCU_VERSION}; \
37-
\
3833
packageFile=${packageName}-${packageVersion}.tgz; \
3934
\
4035
if test x"4.0.11" = x"${packageVersion}"; then \
@@ -45,6 +40,11 @@ RUN set -eux; \
4540
packageSha256sum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482; \
4641
else :; fi; \
4742
\
43+
if test x"" = x"${packageVersion}"; then \
44+
echo "Skip installation of ${packageName} PHP extension"; \
45+
return 0; \
46+
fi; \
47+
\
4848
curl --insecure -sSLfO https://pecl.php.net/get/${packageFile}; \
4949
echo "${packageSha256sum} ${packageFile}" \
5050
| sha256sum -cw --status; \
@@ -61,27 +61,32 @@ RUN set -eux; \
6161
#
6262
ARG MEMCACHE_VERSION
6363
RUN set -eux; \
64-
\
65-
buildDeps=' \
66-
libzip-dev \
67-
'; \
68-
apt-get update; \
69-
apt-get install -y --force-yes --no-upgrade --no-install-recommends \
70-
$buildDeps \
71-
; \
7264
\
7365
packageName=memcache; \
7466
packageVersion=${MEMCACHE_VERSION}; \
75-
\
7667
packageFile=${packageName}-${packageVersion}.tgz; \
7768
\
78-
if test x"4.0.5.2" = x"${packageVersion}"; then \
79-
packageSha256sum=7b7667813baea003671f174bbec849e43ff235a8ea4ab7e36c3a0380c2a9ed63; \
80-
else :; fi; \
8169
if test x"3.0.8" = x"${packageVersion}"; then \
8270
packageSha256sum=2cae5b423ffbfd33a259829849f6000d4db018debe3e29ecf3056f06642e8311; \
8371
else :; fi; \
8472
\
73+
if test x"4.0.5.2" = x"${packageVersion}"; then \
74+
packageSha256sum=7b7667813baea003671f174bbec849e43ff235a8ea4ab7e36c3a0380c2a9ed63; \
75+
else :; fi; \
76+
\
77+
if test x"" = x"${packageVersion}"; then \
78+
echo "Skip installation of ${packageName} PHP extension"; \
79+
return 0; \
80+
fi; \
81+
\
82+
buildDeps=' \
83+
libzip-dev \
84+
'; \
85+
apt-get update; \
86+
apt-get install -y --force-yes --no-upgrade --no-install-recommends \
87+
$buildDeps \
88+
; \
89+
\
8590
curl --insecure -sSLfO https://pecl.php.net/get/${packageFile}; \
8691
echo "${packageSha256sum} ${packageFile}" \
8792
| sha256sum -cw --status; \

‎.docker/php72_73/Dockerfile

+19-15
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ RUN docker-php-ext-install mbstring
99
#
1010
ARG APCU_VERSION
1111
RUN set -eux; \
12-
\
13-
if test x"" = x"${APCU_VERSION}"; then \
14-
return 0; \
15-
else :; fi; \
1612
\
1713
packageName=apcu; \
1814
packageVersion=${APCU_VERSION}; \
19-
\
2015
packageFile=${packageName}-${packageVersion}.tgz; \
2116
\
2217
if test x"5.1.23" = x"${packageVersion}"; then \
2318
packageSha256sum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482; \
2419
else :; fi; \
2520
\
21+
if test x"" = x"${packageVersion}"; then \
22+
echo "Skip installation of ${packageName} PHP extension"; \
23+
return 0; \
24+
fi; \
25+
\
2626
curl --insecure -sSLfO https://pecl.php.net/get/${packageFile}; \
2727
echo "${packageSha256sum} ${packageFile}" \
2828
| sha256sum -cw --status; \
@@ -39,24 +39,28 @@ RUN set -eux; \
3939
#
4040
ARG MEMCACHE_VERSION
4141
RUN set -eux; \
42-
\
43-
buildDeps=' \
44-
libzip-dev \
45-
'; \
46-
apt-get update; \
47-
apt-get install -y --force-yes --no-upgrade --no-install-recommends \
48-
$buildDeps \
49-
; \
5042
\
5143
packageName=memcache; \
5244
packageVersion=${MEMCACHE_VERSION}; \
53-
\
5445
packageFile=${packageName}-${packageVersion}.tgz; \
5546
\
5647
if test x"4.0.5.2" = x"${packageVersion}"; then \
5748
packageSha256sum=7b7667813baea003671f174bbec849e43ff235a8ea4ab7e36c3a0380c2a9ed63; \
5849
else :; fi; \
5950
\
51+
if test x"" = x"${packageVersion}"; then \
52+
echo "Skip installation of ${packageName} PHP extension"; \
53+
return 0; \
54+
fi; \
55+
\
56+
buildDeps=' \
57+
libzip-dev \
58+
'; \
59+
apt-get update; \
60+
apt-get install -y --force-yes --no-upgrade --no-install-recommends \
61+
$buildDeps \
62+
; \
63+
\
6064
curl --insecure -sSLfO https://pecl.php.net/get/${packageFile}; \
6165
echo "${packageSha256sum} ${packageFile}" \
6266
| sha256sum -cw --status; \
@@ -66,7 +70,7 @@ RUN set -eux; \
6670
\
6771
docker-php-ext-enable ${packageName}; \
6872
\
69-
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
73+
apt-get purge -y --force-yes --auto-remove -o APT::AutoRemove::RecommendsImportant=true \
7074
$buildDeps \
7175
; \
7276
apt-get clean; \

0 commit comments

Comments
 (0)