Skip to content

Commit 9a5bfad

Browse files
authored
Merge pull request #469 from continuouspipe/feature/build-in-groups
Build in groups to avoid timeout
2 parents 3664958 + d6d94ea commit 9a5bfad

2 files changed

Lines changed: 52 additions & 14 deletions

File tree

build.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@ else
88
DIR="$(dirname "$0")" ;
99
fi ;
1010

11-
for file in "${DIR}"/*/build.sh; do
12-
# shellcheck source=/dev/null
13-
bash "${file}"
14-
done
11+
12+
shopt -s nullglob
13+
set -- "${DIR}"/*/build.sh
14+
if [ "$#" -gt 0 ]; then
15+
for file in "$@"; do
16+
# shellcheck source=/dev/null
17+
source "${file}"
18+
done
19+
fi
1520

1621
echo "Pulling any external images:"; echo
1722
(cd "$DIR" && grep 'external_.*:' "$DIR/docker-compose.yml" | cut -d":" -f1 | xargs docker-compose pull)

continuous-pipe.yml

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ pipelines:
1010
- third_level_dependency_images
1111
- second_level_dependency_images
1212
- first_level_dependency_images
13-
- no_dependency_images
13+
- no_dependency_images_a_g
14+
- no_dependency_images_h_m
15+
- no_dependency_images_n_r
16+
- no_dependency_images_s_z
1417
- first_level_dependency_eol_images
1518
- no_dependency_eol_images
1619
variables:
@@ -30,7 +33,10 @@ pipelines:
3033
- third_level_dependency_images
3134
- second_level_dependency_images
3235
- first_level_dependency_images
33-
- no_dependency_images
36+
- no_dependency_images_a_g
37+
- no_dependency_images_h_m
38+
- no_dependency_images_n_r
39+
- no_dependency_images_s_z
3440

3541
tasks:
3642
##################################################
@@ -174,10 +180,10 @@ tasks:
174180
WEB_SERVER: apache
175181
FROM_TAG: ${FROM_TAG}
176182

177-
###########################
178-
# No dependency images #
179-
###########################
180-
no_dependency_images:
183+
##############################
184+
# No dependency images (A-G) #
185+
##############################
186+
no_dependency_images_a_g:
181187
build:
182188
environment:
183189
FROM_TAG: ${FROM_TAG}
@@ -260,6 +266,15 @@ tasks:
260266
environment:
261267
PHP_VERSION: '7.1'
262268
FROM_TAG: ${FROM_TAG}
269+
270+
##############################
271+
# No dependency images (H-M) #
272+
##############################
273+
no_dependency_images_h_m:
274+
build:
275+
environment:
276+
FROM_TAG: ${FROM_TAG}
277+
services:
263278
hem:
264279
image: quay.io/continuouspipe/hem1
265280
tag: ${FROM_TAG}
@@ -344,6 +359,15 @@ tasks:
344359
reuse: false
345360
environment:
346361
FROM_TAG: '5.5'
362+
363+
##############################
364+
# No dependency images (N-R) #
365+
##############################
366+
no_dependency_images_n_r:
367+
build:
368+
environment:
369+
FROM_TAG: ${FROM_TAG}
370+
services:
347371
nginx_ingress_controller:
348372
image: quay.io/continuouspipe/nginx-ingress-controller
349373
tag: ${FROM_TAG}
@@ -420,6 +444,10 @@ tasks:
420444
reuse: false
421445
environment:
422446
FROM_TAG: '9.6'
447+
rabbitmq36_management:
448+
image: quay.io/continuouspipe/rabbitmq36-management
449+
tag: ${FROM_TAG}
450+
reuse: false
423451
redis:
424452
image: quay.io/continuouspipe/redis3
425453
tag: ${FROM_TAG}
@@ -428,6 +456,15 @@ tasks:
428456
image: quay.io/continuouspipe/redis3-highly-available
429457
tag: ${FROM_TAG}
430458
reuse: false
459+
460+
##############################
461+
# No dependency images (S-Z) #
462+
##############################
463+
no_dependency_images_s_z:
464+
build:
465+
environment:
466+
FROM_TAG: ${FROM_TAG}
467+
services:
431468
scala_sbt:
432469
image: quay.io/continuouspipe/scala-base
433470
tag: ${FROM_TAG}
@@ -480,10 +517,6 @@ tasks:
480517
image: quay.io/continuouspipe/tideways
481518
tag: ${FROM_TAG}
482519
reuse: false
483-
rabbitmq36_management:
484-
image: quay.io/continuouspipe/rabbitmq36-management
485-
tag: ${FROM_TAG}
486-
reuse: false
487520

488521
first_level_dependency_eol_images:
489522
build:

0 commit comments

Comments
 (0)