Skip to content

Commit 00c8f1a

Browse files
fratcliffefratcliffe
authored
Merge pull request #461 from continuouspipe/feature/DEVOPS-565-use-from-tag
DEVOPS-565: Use from tag for the PHP images
2 parents 4dff1fb + a3f82f9 commit 00c8f1a

4 files changed

Lines changed: 39 additions & 9 deletions

File tree

‎continuous-pipe.yml‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,36 +64,42 @@ tasks:
6464
reuse: false
6565
environment:
6666
PHP_VERSION: '7.1'
67+
FROM_TAG: ${FROM_TAG}
6768
php70_apache:
6869
image: quay.io/continuouspipe/php7-apache
6970
tag: ${FROM_TAG}
7071
reuse: false
7172
environment:
7273
PHP_VERSION: '7.0'
74+
FROM_TAG: ${FROM_TAG}
7375
php56_apache:
7476
image: quay.io/continuouspipe/php5.6-apache
7577
tag: ${FROM_TAG}
7678
reuse: false
7779
environment:
7880
PHP_VERSION: '5.6'
81+
FROM_TAG: ${FROM_TAG}
7982
php71_nginx:
8083
image: quay.io/continuouspipe/php7.1-nginx
8184
tag: ${FROM_TAG}
8285
reuse: false
8386
environment:
8487
PHP_VERSION: '7.1'
88+
FROM_TAG: ${FROM_TAG}
8589
php70_nginx:
8690
image: quay.io/continuouspipe/php7-nginx
8791
tag: ${FROM_TAG}
8892
reuse: false
8993
environment:
9094
PHP_VERSION: '7.0'
95+
FROM_TAG: ${FROM_TAG}
9196
php56_nginx:
9297
image: quay.io/continuouspipe/php5.6-nginx
9398
tag: ${FROM_TAG}
9499
reuse: false
95100
environment:
96101
PHP_VERSION: '5.6'
102+
FROM_TAG: ${FROM_TAG}
97103
solr_4_10:
98104
image: quay.io/continuouspipe/solr4
99105
tag: ${FROM_TAG}
@@ -112,8 +118,6 @@ tasks:
112118
################################
113119
first_level_dependency_images:
114120
build:
115-
environment:
116-
FROM_TAG: ${FROM_TAG}
117121
services:
118122
symfony_php71_nginx:
119123
image: quay.io/continuouspipe/symfony-php7.1-nginx
@@ -122,20 +126,23 @@ tasks:
122126
environment:
123127
PHP_VERSION: '7.1'
124128
WEB_SERVER: nginx
129+
FROM_TAG: ${FROM_TAG}
125130
symfony_php71_apache:
126131
image: quay.io/continuouspipe/symfony-php7.1-apache
127132
tag: ${FROM_TAG}
128133
reuse: false
129134
environment:
130135
PHP_VERSION: '7.1'
131136
WEB_SERVER: apache
137+
FROM_TAG: ${FROM_TAG}
132138
symfony_php70_apache:
133139
image: quay.io/continuouspipe/symfony-php7-apache
134140
tag: ${FROM_TAG}
135141
reuse: false
136142
environment:
137143
PHP_VERSION: '7'
138144
WEB_SERVER: apache
145+
FROM_TAG: ${FROM_TAG}
139146

140147
###########################
141148
# No dependency images #
@@ -157,24 +164,28 @@ tasks:
157164
reuse: false
158165
environment:
159166
PHP_VERSION: '7.1'
167+
FROM_TAG: ${FROM_TAG}
160168
drupal_php70_apache:
161169
image: quay.io/continuouspipe/drupal-php7-apache
162170
tag: ${FROM_TAG}
163171
reuse: false
164172
environment:
165173
PHP_VERSION: '7'
174+
FROM_TAG: ${FROM_TAG}
166175
drupal8_apache_php7:
167176
image: quay.io/continuouspipe/drupal8-apache-php7
168177
tag: ${FROM_TAG}
169178
reuse: false
170179
environment:
171180
PHP_VERSION: '7'
181+
FROM_TAG: ${FROM_TAG}
172182
drupal_php56_apache:
173183
image: quay.io/continuouspipe/drupal-php5.6-apache
174184
tag: ${FROM_TAG}
175185
reuse: false
176186
environment:
177187
PHP_VERSION: '5.6'
188+
FROM_TAG: ${FROM_TAG}
178189
drupal8_solr_4_10:
179190
image: quay.io/continuouspipe/drupal8-solr4
180191
tag: ${FROM_TAG}
@@ -211,12 +222,14 @@ tasks:
211222
reuse: false
212223
environment:
213224
PHP_VERSION: '7'
225+
FROM_TAG: ${FROM_TAG}
214226
ezplatform_php71_apache:
215227
image: quay.io/continuouspipe/ez6-php7.1-apache
216228
tag: ${FROM_TAG}
217229
reuse: false
218230
environment:
219231
PHP_VERSION: '7.1'
232+
FROM_TAG: ${FROM_TAG}
220233
hem:
221234
image: quay.io/continuouspipe/hem1
222235
tag: ${FROM_TAG}
@@ -228,27 +241,31 @@ tasks:
228241
environment:
229242
FROM_IMAGE: php5.6-apache
230243
WEB_SERVER: apache
244+
FROM_TAG: ${FROM_TAG}
231245
magento1_php56_nginx:
232246
image: quay.io/continuouspipe/magento1-nginx-php5.6
233247
tag: ${FROM_TAG}
234248
reuse: false
235249
environment:
236250
FROM_IMAGE: php5.6-nginx
237251
WEB_SERVER: nginx
252+
FROM_TAG: ${FROM_TAG}
238253
magento2_php70_nginx:
239254
image: quay.io/continuouspipe/magento2-nginx-php7
240255
tag: ${FROM_TAG}
241256
reuse: false
242257
environment:
243258
FROM_IMAGE: php7-nginx
244259
WEB_SERVER: nginx
260+
FROM_TAG: ${FROM_TAG}
245261
magento2_php71_nginx:
246262
image: quay.io/continuouspipe/magento2-nginx-php7.1
247263
tag: ${FROM_TAG}
248264
reuse: false
249265
environment:
250266
FROM_IMAGE: php7.1-nginx
251267
WEB_SERVER: nginx
268+
FROM_TAG: ${FROM_TAG}
252269
magento2_varnish:
253270
image: quay.io/continuouspipe/magento2-varnish4
254271
tag: ${FROM_TAG}
@@ -311,39 +328,45 @@ tasks:
311328
reuse: false
312329
environment:
313330
NODE_VERSION: "6.x"
331+
FROM_TAG: ${FROM_TAG}
314332
nodejs6_small:
315333
image: quay.io/continuouspipe/nodejs6-small
316334
tag: ${FROM_TAG}
317335
reuse: false
318336
environment:
319337
NODE_VERSION: "6.x"
320338
INSTALL_COMMON_PACKAGES: "false"
339+
FROM_TAG: ${FROM_TAG}
321340
nodejs7:
322341
image: quay.io/continuouspipe/nodejs7
323342
tag: ${FROM_TAG}
324343
reuse: false
325344
environment:
326345
NODE_VERSION: "7.x"
346+
FROM_TAG: ${FROM_TAG}
327347
nodejs7_small:
328348
image: quay.io/continuouspipe/nodejs7-small
329349
tag: ${FROM_TAG}
330350
reuse: false
331351
environment:
332352
NODE_VERSION: "7.x"
333353
INSTALL_COMMON_PACKAGES: "false"
354+
FROM_TAG: ${FROM_TAG}
334355
nodejs8:
335356
image: quay.io/continuouspipe/nodejs8
336357
tag: ${FROM_TAG}
337358
reuse: false
338359
environment:
339360
NODE_VERSION: "8.x"
361+
FROM_TAG: ${FROM_TAG}
340362
nodejs8_small:
341363
image: quay.io/continuouspipe/nodejs8-small
342364
tag: ${FROM_TAG}
343365
reuse: false
344366
environment:
345367
NODE_VERSION: "8.x"
346368
INSTALL_COMMON_PACKAGES: "false"
369+
FROM_TAG: ${FROM_TAG}
347370
phantomjs2:
348371
image: quay.io/continuouspipe/phantomjs2
349372
tag: ${FROM_TAG}
@@ -354,6 +377,7 @@ tasks:
354377
reuse: false
355378
environment:
356379
PHP_VERSION: 7.1
380+
FROM_TAG: ${FROM_TAG}
357381
postgres94:
358382
image: quay.io/continuouspipe/postgres9.4
359383
tag: ${FROM_TAG}
@@ -389,34 +413,39 @@ tasks:
389413
environment:
390414
PHP_VERSION: '7.1'
391415
WEB_SERVER: nginx
416+
FROM_TAG: ${FROM_TAG}
392417
spryker_php71_apache:
393418
image: quay.io/continuouspipe/spryker-php7.1-apache
394419
tag: ${FROM_TAG}
395420
reuse: false
396421
environment:
397422
PHP_VERSION: '7.1'
398423
WEB_SERVER: apache
424+
FROM_TAG: ${FROM_TAG}
399425
symfony_php70_nginx:
400426
image: quay.io/continuouspipe/symfony-php7-nginx
401427
tag: ${FROM_TAG}
402428
reuse: false
403429
environment:
404430
PHP_VERSION: '7'
405431
WEB_SERVER: nginx
432+
FROM_TAG: ${FROM_TAG}
406433
symfony_php56_nginx:
407434
image: quay.io/continuouspipe/symfony-php5.6-nginx
408435
tag: ${FROM_TAG}
409436
reuse: false
410437
environment:
411438
PHP_VERSION: '5.6'
412439
WEB_SERVER: nginx
440+
FROM_TAG: ${FROM_TAG}
413441
symfony_php56_apache:
414442
image: quay.io/continuouspipe/symfony-php5.6-apache
415443
tag: ${FROM_TAG}
416444
reuse: false
417445
environment:
418446
PHP_VERSION: '5.6'
419447
WEB_SERVER: apache
448+
FROM_TAG: ${FROM_TAG}
420449
tideways:
421450
image: quay.io/continuouspipe/tideways
422451
tag: ${FROM_TAG}
@@ -428,8 +457,6 @@ tasks:
428457

429458
first_level_dependency_eol_images:
430459
build:
431-
environment:
432-
FROM_TAG: ${FROM_TAG}
433460
services:
434461
php55_nginx:
435462
image: quay.io/continuouspipe/eol-php5.5-nginx
@@ -439,11 +466,10 @@ tasks:
439466
docker_file_path: ./Dockerfile-nginx-phpsource
440467
environment:
441468
PHP_FULL_VERSION: '5.5.38'
469+
FROM_TAG: ${FROM_TAG}
442470

443471
no_dependency_eol_images:
444472
build:
445-
environment:
446-
FROM_TAG: ${FROM_TAG}
447473
services:
448474
magento1_php55_nginx:
449475
image: quay.io/continuouspipe/eol-magento1-nginx-php5.5
@@ -453,3 +479,4 @@ tasks:
453479
environment:
454480
FROM_IMAGE: eol-php5.5-nginx
455481
WEB_SERVER: nginx
482+
FROM_TAG: ${FROM_TAG}

‎php/Dockerfile-apache‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM quay.io/continuouspipe/ubuntu16.04:latest
1+
ARG FROM_TAG=latest
2+
FROM quay.io/continuouspipe/ubuntu16.04:${FROM_TAG}
23

34
# Install PHP packages, including the Tideways extension
45
ARG PHP_VERSION

‎php/Dockerfile-nginx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM quay.io/continuouspipe/ubuntu16.04:latest
1+
ARG FROM_TAG=latest
2+
FROM quay.io/continuouspipe/ubuntu16.04:${FROM_TAG}
23

34
# Install PHP packages, including the Tideways extension
45
ARG PHP_VERSION

‎php/Dockerfile-nginx-phpsource‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM quay.io/continuouspipe/ubuntu16.04:latest
1+
ARG FROM_TAG=latest
2+
FROM quay.io/continuouspipe/ubuntu16.04:${FROM_TAG}
23

34
ARG PHP_FULL_VERSION
45
ENV PHP_FULL_VERSION=${PHP_FULL_VERSION}

0 commit comments

Comments
 (0)