Skip to content

Commit 61b8ed4

Browse files
author
Fabian Derschatta
committed
Merge branch 'develop'
2 parents 0c5a561 + 96bdd27 commit 61b8ed4

4 files changed

Lines changed: 100 additions & 48 deletions

File tree

‎.github/workflows/build-php-images.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
on:
2+
workflow_call:
3+
inputs:
4+
version:
5+
required: true
6+
type: string
7+
debug:
8+
required: false
9+
type: boolean
10+
default: true
11+
cron:
12+
required: false
13+
type: boolean
14+
default: true
15+
multiarch:
16+
required: false
17+
type: boolean
18+
default: true
19+
20+
jobs:
21+
build-php-image:
22+
name: Build PHP ${{ inputs.version }} image
23+
uses: ./.github/workflows/build-image.yml
24+
with:
25+
image: php${{ inputs.version }}
26+
context: ./php/php${{ inputs.version }}
27+
multiarch: ${{ inputs.multiarch }}
28+
secrets: inherit
29+
30+
build-php-debug-image:
31+
name: Build PHP ${{ inputs.version }} debug image
32+
if: ${{ inputs.debug == true }}
33+
needs: build-php-image
34+
uses: ./.github/workflows/build-image.yml
35+
with:
36+
image: php${{ inputs.version }}-debug
37+
context: ./php/php${{ inputs.version }}-debug
38+
multiarch: ${{ inputs.multiarch }}
39+
secrets: inherit
40+
41+
build-php-cron-image:
42+
name: Build cron image
43+
if: ${{ inputs.cron == true }}
44+
needs: build-php-image
45+
uses: ./.github/workflows/build-image.yml
46+
with:
47+
image: php${{ inputs.version }}-cron
48+
context: ./php/php${{ inputs.version }}-cron
49+
multiarch: ${{ inputs.multiarch }}
50+
secrets: inherit

‎.github/workflows/release.yml‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,37 +36,35 @@ jobs:
3636
secrets: inherit
3737

3838
build-php-images:
39-
name: Build PHP base images
39+
name: Build PHP images
40+
uses: ./.github/workflows/build-php-images.yml
4041
strategy:
42+
fail-fast: false
4143
matrix:
42-
version: [53, 54, 55, 56, 70, 71, 72, 73, 80, 81, 82, 83]
43-
uses: ./.github/workflows/build-image.yml
44+
version: [73, 74, 80, 81, 82, 83]
4445
with:
45-
image: php${{ matrix.version }}
46-
context: ./php/php${{ matrix.version }}
46+
version: ${{ matrix.version }}
4747
secrets: inherit
4848

49-
build-php-debug-images:
50-
name: Build PHP debug images
51-
needs: build-php-images
52-
strategy:
53-
matrix:
54-
version: [53, 54, 55, 56, 70, 71, 72, 73, 80, 81, 82, 83]
49+
build-legacy-php-base-image:
50+
name: Build legacy PHP base image
5551
uses: ./.github/workflows/build-image.yml
5652
with:
57-
image: php${{ matrix.version }}-debug
58-
context: ./php/php${{ matrix.version }}-debug
53+
image: php-base
54+
context: ./php/base
55+
multiarch: false
5956
secrets: inherit
6057

61-
build-php-cron-images:
62-
name: Build PHP cron images
63-
needs: build-php-images
58+
build-legacy-php-images:
59+
name: Build legacy PHP images
60+
needs: build-legacy-php-base-image
61+
uses: ./.github/workflows/build-php-images.yml
6462
strategy:
63+
fail-fast: false
6564
matrix:
66-
# Note: no cron container for v5.3
67-
version: [54, 55, 56, 70, 71, 72, 73, 80, 81, 82, 83]
68-
uses: ./.github/workflows/build-image.yml
65+
version: [53, 54, 55, 56, 70, 71, 72]
6966
with:
70-
image: php${{ matrix.version }}-cron
71-
context: ./php/php${{ matrix.version }}-cron
67+
version: ${{ matrix.version }}
68+
cron: ${{ matrix.version != 53 }} # 5.3 doesn't have a cron container
69+
multiarch: false
7270
secrets: inherit

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ mutagen.yml.lock
99
/custom/*.yml
1010
/custom/*.yaml
1111
/tools/.update
12-
.idea/
12+
.idea/
13+
.vscode/
14+
.DS_Store
15+
Thumbs.db

‎compose/php.yml‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
volumes:
1313
- ${LOCAL_SRC}:${REMOTE_SRC}
1414
- totara-data:${REMOTE_DATA}
15-
- $HOME/.bash_history:/root/.bash_history
15+
- bash-history:/root/.bash_history
1616
- zsh-history:/root/.zsh_history
1717
- ./shell:/root/custom_shell
1818
depends_on:
@@ -34,7 +34,7 @@ services:
3434
volumes:
3535
- ${LOCAL_SRC}:${REMOTE_SRC}
3636
- totara-data:${REMOTE_DATA}
37-
- $HOME/.bash_history:/root/.bash_history
37+
- bash-history:/root/.bash_history
3838
- zsh-history:/root/.zsh_history
3939
- ./shell:/root/custom_shell
4040
networks:
@@ -52,7 +52,7 @@ services:
5252
volumes:
5353
- ${LOCAL_SRC}:${REMOTE_SRC}
5454
- totara-data:${REMOTE_DATA}
55-
- $HOME/.bash_history:/root/.bash_history
55+
- bash-history:/root/.bash_history
5656
- zsh-history:/root/.zsh_history
5757
- ./shell:/root/custom_shell
5858
depends_on:
@@ -74,7 +74,7 @@ services:
7474
volumes:
7575
- ${LOCAL_SRC}:${REMOTE_SRC}
7676
- totara-data:${REMOTE_DATA}
77-
- $HOME/.bash_history:/root/.bash_history
77+
- bash-history:/root/.bash_history
7878
- zsh-history:/root/.zsh_history
7979
- ./shell:/root/custom_shell
8080
networks:
@@ -104,7 +104,7 @@ services:
104104
volumes:
105105
- ${LOCAL_SRC}:${REMOTE_SRC}
106106
- totara-data:${REMOTE_DATA}
107-
- $HOME/.bash_history:/root/.bash_history
107+
- bash-history:/root/.bash_history
108108
- zsh-history:/root/.zsh_history
109109
- ./shell:/root/custom_shell
110110
depends_on:
@@ -126,7 +126,7 @@ services:
126126
volumes:
127127
- ${LOCAL_SRC}:${REMOTE_SRC}
128128
- totara-data:${REMOTE_DATA}
129-
- $HOME/.bash_history:/root/.bash_history
129+
- bash-history:/root/.bash_history
130130
- zsh-history:/root/.zsh_history
131131
- ./shell:/root/custom_shell
132132
networks:
@@ -156,7 +156,7 @@ services:
156156
volumes:
157157
- ${LOCAL_SRC}:${REMOTE_SRC}
158158
- totara-data:${REMOTE_DATA}
159-
- $HOME/.bash_history:/root/.bash_history
159+
- bash-history:/root/.bash_history
160160
- zsh-history:/root/.zsh_history
161161
- ./shell:/root/custom_shell
162162
depends_on:
@@ -178,7 +178,7 @@ services:
178178
volumes:
179179
- ${LOCAL_SRC}:${REMOTE_SRC}
180180
- totara-data:${REMOTE_DATA}
181-
- $HOME/.bash_history:/root/.bash_history
181+
- bash-history:/root/.bash_history
182182
- zsh-history:/root/.zsh_history
183183
- ./shell:/root/custom_shell
184184
networks:
@@ -208,7 +208,7 @@ services:
208208
volumes:
209209
- ${LOCAL_SRC}:${REMOTE_SRC}
210210
- totara-data:${REMOTE_DATA}
211-
- $HOME/.bash_history:/root/.bash_history
211+
- bash-history:/root/.bash_history
212212
- zsh-history:/root/.zsh_history
213213
- ./shell:/root/custom_shell
214214
depends_on:
@@ -230,7 +230,7 @@ services:
230230
volumes:
231231
- ${LOCAL_SRC}:${REMOTE_SRC}
232232
- totara-data:${REMOTE_DATA}
233-
- $HOME/.bash_history:/root/.bash_history
233+
- bash-history:/root/.bash_history
234234
- zsh-history:/root/.zsh_history
235235
- ./shell:/root/custom_shell
236236
networks:
@@ -260,7 +260,7 @@ services:
260260
volumes:
261261
- ${LOCAL_SRC}:${REMOTE_SRC}
262262
- totara-data:${REMOTE_DATA}
263-
- $HOME/.bash_history:/root/.bash_history
263+
- bash-history:/root/.bash_history
264264
- zsh-history:/root/.zsh_history
265265
- ./shell:/root/custom_shell
266266
depends_on:
@@ -282,7 +282,7 @@ services:
282282
volumes:
283283
- ${LOCAL_SRC}:${REMOTE_SRC}
284284
- totara-data:${REMOTE_DATA}
285-
- $HOME/.bash_history:/root/.bash_history
285+
- bash-history:/root/.bash_history
286286
- zsh-history:/root/.zsh_history
287287
- ./shell:/root/custom_shell
288288
networks:
@@ -312,7 +312,7 @@ services:
312312
volumes:
313313
- ${LOCAL_SRC}:${REMOTE_SRC}
314314
- totara-data:${REMOTE_DATA}
315-
- $HOME/.bash_history:/root/.bash_history
315+
- bash-history:/root/.bash_history
316316
- zsh-history:/root/.zsh_history
317317
- ./shell:/root/custom_shell
318318
depends_on:
@@ -335,7 +335,7 @@ services:
335335
volumes:
336336
- ${LOCAL_SRC}:${REMOTE_SRC}
337337
- totara-data:${REMOTE_DATA}
338-
- $HOME/.bash_history:/root/.bash_history
338+
- bash-history:/root/.bash_history
339339
- zsh-history:/root/.zsh_history
340340
- ./shell:/root/custom_shell
341341
networks:
@@ -365,7 +365,7 @@ services:
365365
volumes:
366366
- ${LOCAL_SRC}:${REMOTE_SRC}
367367
- totara-data:${REMOTE_DATA}
368-
- $HOME/.bash_history:/root/.bash_history
368+
- bash-history:/root/.bash_history
369369
- zsh-history:/root/.zsh_history
370370
- ./shell:/root/custom_shell
371371
depends_on:
@@ -388,7 +388,7 @@ services:
388388
volumes:
389389
- ${LOCAL_SRC}:${REMOTE_SRC}
390390
- totara-data:${REMOTE_DATA}
391-
- $HOME/.bash_history:/root/.bash_history
391+
- bash-history:/root/.bash_history
392392
- zsh-history:/root/.zsh_history
393393
- ./shell:/root/custom_shell
394394
networks:
@@ -418,7 +418,7 @@ services:
418418
volumes:
419419
- ${LOCAL_SRC}:${REMOTE_SRC}
420420
- totara-data:${REMOTE_DATA}
421-
- $HOME/.bash_history:/root/.bash_history
421+
- bash-history:/root/.bash_history
422422
- zsh-history:/root/.zsh_history
423423
- ./shell:/root/custom_shell
424424
depends_on:
@@ -441,7 +441,7 @@ services:
441441
volumes:
442442
- ${LOCAL_SRC}:${REMOTE_SRC}
443443
- totara-data:${REMOTE_DATA}
444-
- $HOME/.bash_history:/root/.bash_history
444+
- bash-history:/root/.bash_history
445445
- zsh-history:/root/.zsh_history
446446
- ./shell:/root/custom_shell
447447
networks:
@@ -470,7 +470,7 @@ services:
470470
volumes:
471471
- ${LOCAL_SRC}:${REMOTE_SRC}
472472
- totara-data:${REMOTE_DATA}
473-
- $HOME/.bash_history:/root/.bash_history
473+
- bash-history:/root/.bash_history
474474
- zsh-history:/root/.zsh_history
475475
- ./shell:/root/custom_shell
476476
depends_on:
@@ -493,7 +493,7 @@ services:
493493
volumes:
494494
- ${LOCAL_SRC}:${REMOTE_SRC}
495495
- totara-data:${REMOTE_DATA}
496-
- $HOME/.bash_history:/root/.bash_history
496+
- bash-history:/root/.bash_history
497497
- zsh-history:/root/.zsh_history
498498
- ./shell:/root/custom_shell
499499
networks:
@@ -520,7 +520,7 @@ services:
520520
volumes:
521521
- ${LOCAL_SRC}:${REMOTE_SRC}
522522
- totara-data:${REMOTE_DATA}
523-
- $HOME/.bash_history:/root/.bash_history
523+
- bash-history:/root/.bash_history
524524
- zsh-history:/root/.zsh_history
525525
- ./shell:/root/custom_shell
526526
depends_on:
@@ -553,7 +553,7 @@ services:
553553
volumes:
554554
- ${LOCAL_SRC}:${REMOTE_SRC}
555555
- totara-data:${REMOTE_DATA}
556-
- $HOME/.bash_history:/root/.bash_history
556+
- bash-history:/root/.bash_history
557557
- zsh-history:/root/.zsh_history
558558
- ./shell:/root/custom_shell
559559
networks:
@@ -570,7 +570,7 @@ services:
570570
volumes:
571571
- ${LOCAL_SRC}:${REMOTE_SRC}
572572
- totara-data:${REMOTE_DATA}
573-
- $HOME/.bash_history:/root/.bash_history
573+
- bash-history:/root/.bash_history
574574
- zsh-history:/root/.zsh_history
575575
- ./shell:/root/custom_shell
576576
depends_on:
@@ -603,7 +603,7 @@ services:
603603
volumes:
604604
- ${LOCAL_SRC}:${REMOTE_SRC}
605605
- totara-data:${REMOTE_DATA}
606-
- $HOME/.bash_history:/root/.bash_history
606+
- bash-history:/root/.bash_history
607607
- zsh-history:/root/.zsh_history
608608
- ./shell:/root/custom_shell
609609
networks:
@@ -620,7 +620,7 @@ services:
620620
volumes:
621621
- ${LOCAL_SRC}:${REMOTE_SRC}
622622
- totara-data:${REMOTE_DATA}
623-
- $HOME/.bash_history:/root/.bash_history
623+
- bash-history:/root/.bash_history
624624
- zsh-history:/root/.zsh_history
625625
- ./shell:/root/custom_shell
626626
depends_on:
@@ -653,12 +653,13 @@ services:
653653
volumes:
654654
- ${LOCAL_SRC}:${REMOTE_SRC}
655655
- totara-data:${REMOTE_DATA}
656-
- $HOME/.bash_history:/root/.bash_history
656+
- bash-history:/root/.bash_history
657657
- zsh-history:/root/.zsh_history
658658
- ./shell:/root/custom_shell
659659
networks:
660660
- totara
661661

662662
volumes:
663663
totara-data:
664+
bash-history:
664665
zsh-history:

0 commit comments

Comments
 (0)