Skip to content

Commit c95b9be

Browse files
author
ophelie.mauger
committed
Add zlib in php7.0 and 7.1
1 parent 63061a5 commit c95b9be

File tree

11 files changed

+207
-163
lines changed

11 files changed

+207
-163
lines changed

‎.gitlab-ci.yml‎

Lines changed: 117 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -8,131 +8,38 @@ before_script:
88
- if [[ "$CI_BUILD_REF_NAME" != master ]]; then REGISTRY="$REGISTRY/$CI_BUILD_REF_NAME"; fi
99
- NAMESPACE=$REGISTRY/library
1010

11-
12-
5.6-fpm:
13-
stage: build
14-
only:
15-
- preprod
16-
- master
17-
script:
18-
- docker build --pull -t $REGISTRY/php:5.6-fpm 5.6-fpm/ >> /dev/null
19-
- docker push $REGISTRY/php:5.6-fpm > /dev/null
20-
- docker tag $REGISTRY/php:5.6-fpm $NAMESPACE/php:5.6-fpm > /dev/null
21-
- docker push $NAMESPACE/php:5.6-fpm > /dev/null
22-
- docker tag $REGISTRY/php:5.6-fpm $REGISTRY/php:5.6-fpm-extra
23-
- docker push $REGISTRY/php:5.6-fpm-extra
24-
25-
5.6-apache:
26-
stage: build
27-
only:
28-
- preprod
29-
- master
30-
script:
31-
- docker build --pull -t $REGISTRY/php:5.6-apache 5.6-apache/ > /dev/null
32-
- docker push $REGISTRY/php:5.6-apache > /dev/null
33-
- docker tag $REGISTRY/php:5.6-apache $NAMESPACE/php:5.6-apache > /dev/null
34-
- docker push $NAMESPACE/php:5.6-apache > /dev/null
35-
36-
5.6-cli:
37-
stage: build
38-
only:
39-
- preprod
40-
- master
41-
script:
42-
- docker build --pull -t $REGISTRY/php:5.6-cli 5.6-cli/ > /dev/null
43-
- docker push $REGISTRY/php:5.6-cli > /dev/null
44-
- docker tag $REGISTRY/php:5.6-cli $NAMESPACE/php:5.6-cli > /dev/null
45-
- docker push $NAMESPACE/php:5.6-cli > /dev/null
46-
47-
48-
49-
5.5-fpm:
50-
stage: build
51-
only:
52-
- preprod
53-
- master
54-
script:
55-
- docker build --pull -t $REGISTRY/php:5.5-fpm 5.5-fpm/ >> /dev/null
56-
- docker push $REGISTRY/php:5.5-fpm > /dev/null
57-
- docker tag $REGISTRY/php:5.5-fpm $NAMESPACE/php:5.5-fpm > /dev/null
58-
- docker push $NAMESPACE/php:5.5-fpm > /dev/null
59-
- docker tag $REGISTRY/php:5.5-fpm $REGISTRY/php:5.5-fpm-extra
60-
- docker push $REGISTRY/php:5.5-fpm-extra
61-
62-
5.5-apache:
63-
stage: build
64-
only:
65-
- preprod
66-
- master
67-
script:
68-
- docker build --pull -t $REGISTRY/php:5.5-apache 5.5-apache/ > /dev/null
69-
- docker push $REGISTRY/php:5.5-apache > /dev/null
70-
- docker tag $REGISTRY/php:5.5-apache $NAMESPACE/php:5.5-apache > /dev/null
71-
- docker push $NAMESPACE/php:5.5-apache > /dev/null
72-
73-
5.5-cli:
74-
stage: build
75-
only:
76-
- preprod
77-
- master
78-
script:
79-
- docker build --pull -t $REGISTRY/php:5.5-cli 5.5-cli/ > /dev/null
80-
- docker push $REGISTRY/php:5.5-cli > /dev/null
81-
- docker tag $REGISTRY/php:5.5-cli $NAMESPACE/php:5.5-cli > /dev/null
82-
- docker push $NAMESPACE/php:5.5-cli > /dev/null
83-
84-
85-
86-
5.4-fpm:
87-
stage: build
88-
only:
89-
- preprod
90-
- master
91-
script:
92-
- docker build --pull -t $REGISTRY/php:5.4-fpm 5.4-fpm/ >> /dev/null
93-
- docker push $REGISTRY/php:5.4-fpm > /dev/null
94-
- docker tag $REGISTRY/php:5.4-fpm $NAMESPACE/php:5.4-fpm > /dev/null
95-
- docker push $NAMESPACE/php:5.4-fpm > /dev/null
96-
- docker tag $REGISTRY/php:5.4-fpm $REGISTRY/php:5.4-fpm-extra
97-
- docker push $REGISTRY/php:5.4-fpm-extra
98-
99-
5.4-apache:
11+
7.1-fpm:
10012
stage: build
10113
only:
10214
- preprod
10315
- master
10416
script:
105-
- docker build --pull -t $REGISTRY/php:5.4-apache 5.4-apache/ > /dev/null
106-
- docker push $REGISTRY/php:5.4-apache > /dev/null
107-
- docker tag $REGISTRY/php:5.4-apache $NAMESPACE/php:5.4-apache > /dev/null
108-
- docker push $NAMESPACE/php:5.4-apache > /dev/null
17+
- docker build --pull -t $REGISTRY/php:7.1-fpm 7.1-fpm/ >> /dev/null
18+
- docker push $REGISTRY/php:7.1-fpm > /dev/null
19+
- docker tag $REGISTRY/php:7.1-fpm $NAMESPACE/php:7.1-fpm > /dev/null
20+
- docker push $NAMESPACE/php:7.1-fpm > /dev/null
10921

110-
5.4-cli:
22+
7.1-apache:
11123
stage: build
11224
only:
11325
- preprod
11426
- master
11527
script:
116-
- docker build --pull -t $REGISTRY/php:5.4-cli 5.4-cli/ > /dev/null
117-
- docker push $REGISTRY/php:5.4-cli > /dev/null
118-
- docker tag $REGISTRY/php:5.4-cli $NAMESPACE/php:5.4-cli > /dev/null
119-
- docker push $NAMESPACE/php:5.4-cli > /dev/null
120-
28+
- docker build --pull -t $REGISTRY/php:7.1-apache 7.1-apache/ > /dev/null
29+
- docker push $REGISTRY/php:7.1-apache > /dev/null
30+
- docker tag $REGISTRY/php:7.1-apache $NAMESPACE/php:7.1-apache > /dev/null
31+
- docker push $NAMESPACE/php:7.1-apache > /dev/null
12132

122-
5.3-fpm:
33+
7.1-cli:
12334
stage: build
12435
only:
12536
- preprod
12637
- master
12738
script:
128-
- docker build --pull -t $REGISTRY/php:5.3-fpm 5.3-fpm/ > /dev/null
129-
- docker push $REGISTRY/php:5.3-fpm > /dev/null
130-
- docker tag $REGISTRY/php:5.3-fpm $NAMESPACE/php:5.3-fpm > /dev/null
131-
- docker push $NAMESPACE/php:5.3-fpm > /dev/null
132-
- docker tag $REGISTRY/php:5.3-fpm $REGISTRY/php:5.3-fpm-extra
133-
- docker push $REGISTRY/php:5.3-fpm-extra
134-
135-
39+
- docker build --pull -t $REGISTRY/php:7.1-cli 7.1-cli/ > /dev/null
40+
- docker push $REGISTRY/php:7.1-cli > /dev/null
41+
- docker tag $REGISTRY/php:7.1-cli $NAMESPACE/php:7.1-cli > /dev/null
42+
- docker push $NAMESPACE/php:7.1-cli > /dev/null
13643

13744
7.0-fpm:
13845
stage: build
@@ -167,40 +74,123 @@ before_script:
16774
- docker tag $REGISTRY/php:7.0-cli $NAMESPACE/php:7.0-cli > /dev/null
16875
- docker push $NAMESPACE/php:7.0-cli > /dev/null
16976

170-
171-
172-
7.1-fpm:
77+
5.6-fpm:
17378
stage: build
17479
only:
17580
- preprod
17681
- master
17782
script:
178-
- docker build --pull -t $REGISTRY/php:7.1-fpm 7.1-fpm/ >> /dev/null
179-
- docker push $REGISTRY/php:7.1-fpm > /dev/null
180-
- docker tag $REGISTRY/php:7.1-fpm $NAMESPACE/php:7.1-fpm > /dev/null
181-
- docker push $NAMESPACE/php:7.1-fpm > /dev/null
83+
- docker build --pull -t $REGISTRY/php:5.6-fpm 5.6-fpm/ >> /dev/null
84+
- docker push $REGISTRY/php:5.6-fpm > /dev/null
85+
- docker tag $REGISTRY/php:5.6-fpm $NAMESPACE/php:5.6-fpm > /dev/null
86+
- docker push $NAMESPACE/php:5.6-fpm > /dev/null
87+
- docker tag $REGISTRY/php:5.6-fpm $REGISTRY/php:5.6-fpm-extra
88+
- docker push $REGISTRY/php:5.6-fpm-extra
18289

183-
7.1-apache:
90+
5.6-apache:
18491
stage: build
18592
only:
18693
- preprod
18794
- master
18895
script:
189-
- docker build --pull -t $REGISTRY/php:7.1-apache 7.1-apache/ > /dev/null
190-
- docker push $REGISTRY/php:7.1-apache > /dev/null
191-
- docker tag $REGISTRY/php:7.1-apache $NAMESPACE/php:7.1-apache > /dev/null
192-
- docker push $NAMESPACE/php:7.1-apache > /dev/null
96+
- docker build --pull -t $REGISTRY/php:5.6-apache 5.6-apache/ > /dev/null
97+
- docker push $REGISTRY/php:5.6-apache > /dev/null
98+
- docker tag $REGISTRY/php:5.6-apache $NAMESPACE/php:5.6-apache > /dev/null
99+
- docker push $NAMESPACE/php:5.6-apache > /dev/null
193100

194-
7.1-cli:
101+
5.6-cli:
195102
stage: build
196103
only:
197104
- preprod
198105
- master
199106
script:
200-
- docker build --pull -t $REGISTRY/php:7.1-cli 7.1-cli/ > /dev/null
201-
- docker push $REGISTRY/php:7.1-cli > /dev/null
202-
- docker tag $REGISTRY/php:7.1-cli $NAMESPACE/php:7.1-cli > /dev/null
203-
- docker push $NAMESPACE/php:7.1-cli > /dev/null
204-
205-
107+
- docker build --pull -t $REGISTRY/php:5.6-cli 5.6-cli/ > /dev/null
108+
- docker push $REGISTRY/php:5.6-cli > /dev/null
109+
- docker tag $REGISTRY/php:5.6-cli $NAMESPACE/php:5.6-cli > /dev/null
110+
- docker push $NAMESPACE/php:5.6-cli > /dev/null
206111

112+
# 5.5-fpm:
113+
# stage: build
114+
# only:
115+
# - preprod
116+
# - master
117+
# script:
118+
# - docker build --pull -t $REGISTRY/php:5.5-fpm 5.5-fpm/ >> /dev/null
119+
# - docker push $REGISTRY/php:5.5-fpm > /dev/null
120+
# - docker tag $REGISTRY/php:5.5-fpm $NAMESPACE/php:5.5-fpm > /dev/null
121+
# - docker push $NAMESPACE/php:5.5-fpm > /dev/null
122+
# - docker tag $REGISTRY/php:5.5-fpm $REGISTRY/php:5.5-fpm-extra
123+
# - docker push $REGISTRY/php:5.5-fpm-extra
124+
125+
# 5.5-apache:
126+
# stage: build
127+
# only:
128+
# - preprod
129+
# - master
130+
# script:
131+
# - docker build --pull -t $REGISTRY/php:5.5-apache 5.5-apache/ > /dev/null
132+
# - docker push $REGISTRY/php:5.5-apache > /dev/null
133+
# - docker tag $REGISTRY/php:5.5-apache $NAMESPACE/php:5.5-apache > /dev/null
134+
# - docker push $NAMESPACE/php:5.5-apache > /dev/null
135+
136+
# 5.5-cli:
137+
# stage: build
138+
# only:
139+
# - preprod
140+
# - master
141+
# script:
142+
# - docker build --pull -t $REGISTRY/php:5.5-cli 5.5-cli/ > /dev/null
143+
# - docker push $REGISTRY/php:5.5-cli > /dev/null
144+
# - docker tag $REGISTRY/php:5.5-cli $NAMESPACE/php:5.5-cli > /dev/null
145+
# - docker push $NAMESPACE/php:5.5-cli > /dev/null
146+
147+
148+
149+
# 5.4-fpm:
150+
# stage: build
151+
# only:
152+
# - preprod
153+
# - master
154+
# script:
155+
# - docker build --pull -t $REGISTRY/php:5.4-fpm 5.4-fpm/ >> /dev/null
156+
# - docker push $REGISTRY/php:5.4-fpm > /dev/null
157+
# - docker tag $REGISTRY/php:5.4-fpm $NAMESPACE/php:5.4-fpm > /dev/null
158+
# - docker push $NAMESPACE/php:5.4-fpm > /dev/null
159+
# - docker tag $REGISTRY/php:5.4-fpm $REGISTRY/php:5.4-fpm-extra
160+
# - docker push $REGISTRY/php:5.4-fpm-extra
161+
162+
# 5.4-apache:
163+
# stage: build
164+
# only:
165+
# - preprod
166+
# - master
167+
# script:
168+
# - docker build --pull -t $REGISTRY/php:5.4-apache 5.4-apache/ > /dev/null
169+
# - docker push $REGISTRY/php:5.4-apache > /dev/null
170+
# - docker tag $REGISTRY/php:5.4-apache $NAMESPACE/php:5.4-apache > /dev/null
171+
# - docker push $NAMESPACE/php:5.4-apache > /dev/null
172+
173+
# 5.4-cli:
174+
# stage: build
175+
# only:
176+
# - preprod
177+
# - master
178+
# script:
179+
# - docker build --pull -t $REGISTRY/php:5.4-cli 5.4-cli/ > /dev/null
180+
# - docker push $REGISTRY/php:5.4-cli > /dev/null
181+
# - docker tag $REGISTRY/php:5.4-cli $NAMESPACE/php:5.4-cli > /dev/null
182+
# - docker push $NAMESPACE/php:5.4-cli > /dev/null
183+
184+
185+
# 5.3-fpm:
186+
# stage: build
187+
# only:
188+
# - preprod
189+
# - master
190+
# script:
191+
# - docker build --pull -t $REGISTRY/php:5.3-fpm 5.3-fpm/ > /dev/null
192+
# - docker push $REGISTRY/php:5.3-fpm > /dev/null
193+
# - docker tag $REGISTRY/php:5.3-fpm $NAMESPACE/php:5.3-fpm > /dev/null
194+
# - docker push $NAMESPACE/php:5.3-fpm > /dev/null
195+
# - docker tag $REGISTRY/php:5.3-fpm $REGISTRY/php:5.3-fpm-extra
196+
# - docker push $REGISTRY/php:5.3-fpm-extra

‎7.0-apache/Dockerfile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h && \
5656
pecl install redis && \
5757
pecl install xdebug
5858

59+
ADD http://www.zlib.net/zlib-1.2.11.tar.gz /tmp/zlib.tar.gz
60+
RUN tar zxpf /tmp/zlib.tar.gz -C /tmp && \
61+
cd /tmp/zlib-1.2.11 && \
62+
./configure --prefix=/usr/local/zlib && \
63+
make && make install && \
64+
rm -Rf /tmp/zlib-1.2.11 && \
65+
rm /tmp/zlib.tar.gz
66+
5967
ADD https://blackfire.io/api/v1/releases/probe/php/linux/amd64/56 /tmp/blackfire-probe.tar.gz
6068
RUN tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp && \
6169
mv /tmp/blackfire-*.so `php -r "echo ini_get('extension_dir');"`/blackfire.so && \

‎7.0-cli/Dockerfile‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@ RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h && \
5656
pecl install redis && \
5757
pecl install xdebug
5858

59+
ADD http://www.zlib.net/zlib-1.2.11.tar.gz /tmp/zlib.tar.gz
60+
RUN tar zxpf /tmp/zlib.tar.gz -C /tmp && \
61+
cd /tmp/zlib-1.2.11 && \
62+
./configure --prefix=/usr/local/zlib && \
63+
make && make install && \
64+
rm -Rf /tmp/zlib-1.2.11 && \
65+
rm /tmp/zlib.tar.gz
66+
67+
5968
ADD https://blackfire.io/api/v1/releases/probe/php/linux/amd64/56 /tmp/blackfire-probe.tar.gz
6069
RUN tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp && \
6170
mv /tmp/blackfire-*.so `php -r "echo ini_get('extension_dir');"`/blackfire.so && \
@@ -71,4 +80,4 @@ COPY docker-entrypoint.sh /entrypoint.sh
7180

7281
WORKDIR /var/www
7382

74-
ENTRYPOINT ["/entrypoint.sh"]
83+
ENTRYPOINT ["/entrypoint.sh"]

‎7.0-fpm/Dockerfile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h && \
5656
pecl install redis && \
5757
pecl install xdebug
5858

59+
ADD http://www.zlib.net/zlib-1.2.11.tar.gz /tmp/zlib.tar.gz
60+
RUN tar zxpf /tmp/zlib.tar.gz -C /tmp && \
61+
cd /tmp/zlib-1.2.11 && \
62+
./configure --prefix=/usr/local/zlib && \
63+
make && make install && \
64+
rm -Rf /tmp/zlib-1.2.11 && \
65+
rm /tmp/zlib.tar.gz
66+
5967
ADD https://blackfire.io/api/v1/releases/probe/php/linux/amd64/56 /tmp/blackfire-probe.tar.gz
6068
RUN tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp && \
6169
mv /tmp/blackfire-*.so `php -r "echo ini_get('extension_dir');"`/blackfire.so && \

‎7.1-apache/Dockerfile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h && \
5656
pecl install redis && \
5757
pecl install xdebug
5858

59+
ADD http://www.zlib.net/zlib-1.2.11.tar.gz /tmp/zlib.tar.gz
60+
RUN tar zxpf /tmp/zlib.tar.gz -C /tmp && \
61+
cd /tmp/zlib-1.2.11 && \
62+
./configure --prefix=/usr/local/zlib && \
63+
make && make install && \
64+
rm -Rf /tmp/zlib-1.2.11 && \
65+
rm /tmp/zlib.tar.gz
66+
5967
ADD https://blackfire.io/api/v1/releases/probe/php/linux/amd64/56 /tmp/blackfire-probe.tar.gz
6068
RUN tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp && \
6169
mv /tmp/blackfire-*.so `php -r "echo ini_get('extension_dir');"`/blackfire.so && \

‎7.1-cli/Dockerfile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h && \
5656
pecl install redis && \
5757
pecl install xdebug
5858

59+
ADD http://www.zlib.net/zlib-1.2.11.tar.gz /tmp/zlib.tar.gz
60+
RUN tar zxpf /tmp/zlib.tar.gz -C /tmp && \
61+
cd /tmp/zlib-1.2.11 && \
62+
./configure --prefix=/usr/local/zlib && \
63+
make && make install && \
64+
rm -Rf /tmp/zlib-1.2.11 && \
65+
rm /tmp/zlib.tar.gz
66+
5967
ADD https://blackfire.io/api/v1/releases/probe/php/linux/amd64/56 /tmp/blackfire-probe.tar.gz
6068
RUN tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp && \
6169
mv /tmp/blackfire-*.so `php -r "echo ini_get('extension_dir');"`/blackfire.so && \
@@ -71,4 +79,4 @@ COPY docker-entrypoint.sh /entrypoint.sh
7179

7280
WORKDIR /var/www
7381

74-
ENTRYPOINT ["/entrypoint.sh"]
82+
ENTRYPOINT ["/entrypoint.sh"]

‎7.1-fpm/Dockerfile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h && \
5656
pecl install redis && \
5757
pecl install xdebug
5858

59+
ADD http://www.zlib.net/zlib-1.2.11.tar.gz /tmp/zlib.tar.gz
60+
RUN tar zxpf /tmp/zlib.tar.gz -C /tmp && \
61+
cd /tmp/zlib-1.2.11 && \
62+
./configure --prefix=/usr/local/zlib && \
63+
make && make install && \
64+
rm -Rf /tmp/zlib-1.2.11 && \
65+
rm /tmp/zlib.tar.gz
66+
5967
ADD https://blackfire.io/api/v1/releases/probe/php/linux/amd64/56 /tmp/blackfire-probe.tar.gz
6068
RUN tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp && \
6169
mv /tmp/blackfire-*.so `php -r "echo ini_get('extension_dir');"`/blackfire.so && \

0 commit comments

Comments
 (0)