Skip to content

Commit 36855a3

Browse files
srozesroze
authored
Merge pull request #460 from continuouspipe/feature/php-7.2
Add PHP 7.2 images in base and Symfony varients
2 parents 00c8f1a + 192e7bd commit 36855a3

8 files changed

Lines changed: 140 additions & 5 deletions

File tree

‎continuous-pipe.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ tasks:
5858
image: quay.io/continuouspipe/nginx
5959
tag: ${FROM_TAG}
6060
reuse: false
61+
php72_apache:
62+
image: quay.io/continuouspipe/php7.2-apache
63+
tag: ${FROM_TAG}
64+
reuse: false
65+
environment:
66+
PHP_VERSION: '7.2'
67+
FROM_TAG: ${FROM_TAG}
6168
php71_apache:
6269
image: quay.io/continuouspipe/php7.1-apache
6370
tag: ${FROM_TAG}
@@ -79,6 +86,13 @@ tasks:
7986
environment:
8087
PHP_VERSION: '5.6'
8188
FROM_TAG: ${FROM_TAG}
89+
php72_nginx:
90+
image: quay.io/continuouspipe/php7.2-nginx
91+
tag: ${FROM_TAG}
92+
reuse: false
93+
environment:
94+
PHP_VERSION: '7.2'
95+
FROM_TAG: ${FROM_TAG}
8296
php71_nginx:
8397
image: quay.io/continuouspipe/php7.1-nginx
8498
tag: ${FROM_TAG}
@@ -119,6 +133,14 @@ tasks:
119133
first_level_dependency_images:
120134
build:
121135
services:
136+
symfony_php72_nginx:
137+
image: quay.io/continuouspipe/symfony-php7.2-nginx
138+
tag: ${FROM_TAG}
139+
reuse: false
140+
environment:
141+
PHP_VERSION: '7.2'
142+
WEB_SERVER: nginx
143+
FROM_TAG: ${FROM_TAG}
122144
symfony_php71_nginx:
123145
image: quay.io/continuouspipe/symfony-php7.1-nginx
124146
tag: ${FROM_TAG}
@@ -127,6 +149,14 @@ tasks:
127149
PHP_VERSION: '7.1'
128150
WEB_SERVER: nginx
129151
FROM_TAG: ${FROM_TAG}
152+
symfony_php72_apache:
153+
image: quay.io/continuouspipe/symfony-php7.2-apache
154+
tag: ${FROM_TAG}
155+
reuse: false
156+
environment:
157+
PHP_VERSION: '7.2'
158+
WEB_SERVER: apache
159+
FROM_TAG: ${FROM_TAG}
130160
symfony_php71_apache:
131161
image: quay.io/continuouspipe/symfony-php7.1-apache
132162
tag: ${FROM_TAG}

‎docker-compose.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,16 @@ services:
332332
depends_on:
333333
- php71_apache
334334

335+
php72_apache:
336+
build:
337+
context: ./php/
338+
dockerfile: Dockerfile-apache
339+
args:
340+
PHP_VERSION: '7.2'
341+
image: quay.io/continuouspipe/php7.2-apache:latest
342+
depends_on:
343+
- ubuntu
344+
335345
php71_apache:
336346
build:
337347
context: ./php/
@@ -362,6 +372,16 @@ services:
362372
depends_on:
363373
- ubuntu
364374

375+
php72_nginx:
376+
build:
377+
context: ./php/
378+
dockerfile: Dockerfile-nginx
379+
args:
380+
PHP_VERSION: '7.2'
381+
image: quay.io/continuouspipe/php7.2-nginx:latest
382+
depends_on:
383+
- ubuntu
384+
365385
php71_nginx:
366386
build:
367387
context: ./php/
@@ -484,6 +504,16 @@ services:
484504
depends_on:
485505
- php71_apache
486506

507+
symfony_php72_nginx:
508+
build:
509+
context: ./symfony/
510+
args:
511+
PHP_VERSION: '7.2'
512+
WEB_SERVER: nginx
513+
image: quay.io/continuouspipe/symfony-php7.2-nginx:latest
514+
depends_on:
515+
- php72_nginx
516+
487517
symfony_php71_nginx:
488518
build:
489519
context: ./symfony/
@@ -514,6 +544,16 @@ services:
514544
depends_on:
515545
- php56_nginx
516546

547+
symfony_php72_apache:
548+
build:
549+
context: ./symfony/
550+
args:
551+
PHP_VERSION: '7.2'
552+
WEB_SERVER: apache
553+
image: quay.io/continuouspipe/symfony-php7.2-apache:latest
554+
depends_on:
555+
- php72_apache
556+
517557
symfony_php71_apache:
518558
build:
519559
context: ./symfony/

‎php/Dockerfile-apache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN echo 'deb http://s3-eu-west-1.amazonaws.com/qafoo-profiler/packages debian m
3030
"php$PHP_VERSION-gd" \
3131
"php$PHP_VERSION-intl" \
3232
"php$PHP_VERSION-mbstring" \
33-
"php$PHP_VERSION-mcrypt" \
33+
"$( dpkg --compare-versions "$PHP_VERSION" ge 7.2 || echo "php$PHP_VERSION-mcrypt" )" \
3434
"php$PHP_VERSION-opcache" \
3535
"php$PHP_VERSION-pgsql" \
3636
"php$PHP_VERSION-soap" \

‎php/Dockerfile-nginx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN echo 'deb http://s3-eu-west-1.amazonaws.com/qafoo-profiler/packages debian m
2727
"php$PHP_VERSION-gd" \
2828
"php$PHP_VERSION-intl" \
2929
"php$PHP_VERSION-mbstring" \
30-
"php$PHP_VERSION-mcrypt" \
30+
"$( dpkg --compare-versions "$PHP_VERSION" ge 7.2 || echo "php$PHP_VERSION-mcrypt" )" \
3131
"php$PHP_VERSION-opcache" \
3232
"php$PHP_VERSION-pgsql" \
3333
"php$PHP_VERSION-soap" \

‎php/Dockerfile-nginx-phpsource‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN export PHP_VERSION=${PHP_FULL_VERSION%.[0-9]*} \
2929
libicu-dev \
3030
libjpeg-dev \
3131
libltdl-dev \
32-
libmcrypt-dev \
32+
"$( dpkg --compare-versions "$PHP_VERSION" ge 7.2 || echo "libmcrypt-dev" )" \
3333
libmemcached-dev \
3434
libmysqlclient-dev \
3535
libpng-dev \
@@ -75,7 +75,7 @@ RUN export PHP_VERSION=${PHP_FULL_VERSION%.[0-9]*} \
7575
--with-webp-dir=/usr \
7676
--enable-intl \
7777
--enable-mbstring \
78-
--with-mcrypt \
78+
"$( dpkg --compare-versions "$PHP_VERSION" ge 7.2 || echo "--with-mcrypt" )" \
7979
--with-mhash \
8080
--enable-mysqlnd \
8181
--with-mysql=mysqlnd \
@@ -117,7 +117,7 @@ RUN export PHP_VERSION=${PHP_FULL_VERSION%.[0-9]*} \
117117
--with-webp-dir=/usr \
118118
--enable-intl \
119119
--enable-mbstring \
120-
--with-mcrypt \
120+
"$( dpkg --compare-versions "$PHP_VERSION" ge 7.2 || echo "--with-mcrypt" )" \
121121
--with-mhash \
122122
--enable-mysqlnd \
123123
--with-mysql=mysqlnd \

‎php/apache/README.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,35 @@
11
# PHP Apache
2+
For PHP 7.2 in a Dockerfile:
3+
```Dockerfile
4+
FROM quay.io/continuouspipe/php7.2-apache:stable
5+
ARG GITHUB_TOKEN=
6+
7+
COPY . /app
8+
RUN container build
9+
```
10+
or in a docker-compose.yml:
11+
```yml
12+
version: '3'
13+
services:
14+
web:
15+
image: quay.io/continuouspipe/php7.2-apache:stable
16+
```
17+
18+
For PHP 7.1 in a Dockerfile:
19+
```Dockerfile
20+
FROM quay.io/continuouspipe/php7.1-apache:stable
21+
ARG GITHUB_TOKEN=
22+
23+
COPY . /app
24+
RUN container build
25+
```
26+
or in a docker-compose.yml:
27+
```yml
28+
version: '3'
29+
services:
30+
web:
31+
image: quay.io/continuouspipe/php7.1-apache:stable
32+
```
233
334
For PHP 7.0 in a Dockerfile:
435
```Dockerfile

‎php/nginx/README.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# PHP NGINX
22

3+
For PHP 7.2 in a Dockerfile:
4+
```Dockerfile
5+
FROM quay.io/continuouspipe/php7.2-nginx:stable
6+
ARG GITHUB_TOKEN=
7+
8+
COPY . /app
9+
RUN container build
10+
```
11+
or in a docker-compose.yml:
12+
```yml
13+
version: '3'
14+
services:
15+
web:
16+
image: quay.io/continuouspipe/php7.2-nginx:stable
17+
```
18+
319
For PHP 7.1 in a Dockerfile:
420
```Dockerfile
521
FROM quay.io/continuouspipe/php7.1-nginx:stable

‎symfony/README.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,15 @@ var/cache/**
6666
# Symfony with Nginx
6767

6868
In a Dockerfile:
69+
```Dockerfile
70+
FROM quay.io/continuouspipe/symfony-php7.2-nginx:stable
71+
ARG GITHUB_TOKEN=
72+
ARG SYMFONY_ENV=prod
73+
74+
COPY . /app/
75+
RUN container build
76+
```
77+
6978
```Dockerfile
7079
FROM quay.io/continuouspipe/symfony-php7.1-nginx:stable
7180
ARG GITHUB_TOKEN=
@@ -96,6 +105,15 @@ RUN container build
96105
# Symfony with Apache
97106

98107
In a Dockerfile:
108+
```Dockerfile
109+
FROM quay.io/continuouspipe/symfony-php7.2-apache:stable
110+
ARG GITHUB_TOKEN=
111+
ARG SYMFONY_ENV=prod
112+
113+
COPY . /app/
114+
RUN container build
115+
```
116+
99117
```Dockerfile
100118
FROM quay.io/continuouspipe/symfony-php7.1-apache:stable
101119
ARG GITHUB_TOKEN=

0 commit comments

Comments
 (0)