infrastructure/gitlab-ci
2
0
Fork 0
Code Issues 17 Pull Requests 1 Actions Projects Releases 21 Wiki Activity

Merge branch '38-fix-docker-build' into 'development'

Browse Source 
fix: docker build

See merge request nofusscomputing/projects/gitlab-ci!64
This commit is contained in:
Jon Lockwood
2023-06-28 03:12:52 +00:00
parent 2492fdb17f 4ea999cec9
commit fd570fa3df
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/build.gitlab-ci.yaml
View File

@ -112,7 +112,7 @@ variables:
- '{dockerfile,dockerfile.j2}'
changes:
paths:
- '{dockerfile,dockerfile.j2,includes/**}'
- '{dockerfile,dockerfile.j2,includes/**/*}'
compare_to: 'master'
when: always
@ -124,7 +124,7 @@ variables:
- '{dockerfile,dockerfile.j2}'
changes:
paths:
- '{dockerfile,dockerfile.j2,includes/**}'
- '{dockerfile,dockerfile.j2,includes/**/*}'
compare_to: 'development'
when: always

2
docker/publish.gitlab-ci.yaml
View File

@ -116,7 +116,7 @@
- '{dockerfile,dockerfile.j2}'
changes:
paths:
- '{dockerfile,dockerfile.j2,includes/**}'
- '{dockerfile,dockerfile.j2,includes/**/*}'
compare_to: 'master'
allow_failure: true
when: on_success

2
template/docker-image.gitlab-ci.yaml
View File

@ -52,7 +52,7 @@ Docker.Hub.Branch.Publish:
- '{dockerfile,dockerfile.j2}'
changes:
paths:
- '{dockerfile,dockerfile.j2,includes**/**}'
- '{dockerfile,dockerfile.j2,includes/**/*}'
compare_to: 'master'
allow_failure: true
when: manual