openlp/runners
1
0
Fork 0
mirror of https://gitlab.com/openlp/runners.git synced 2024-12-22 11:22:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'add-npm-to-angular-image' into 'master'

Browse Source 
Add npm to the Angular image

See merge request openlp/runners!39
This commit is contained in:
Raoul Snyman 2024-04-27 19:50:57 +00:00
commit d58bf98185
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
.gitlab-ci.yml
View File

@ -20,6 +20,8 @@ lint-dockerfiles:
- '' - ''
script: script:
- hadolint --failure-threshold error Dockerfile.* - hadolint --failure-threshold error Dockerfile.*
rules:
- when: always
test-debian: test-debian:
stage: test stage: test
@ -27,7 +29,7 @@ test-debian:
- docker pull $IMAGE_BASE/debian || true - docker pull $IMAGE_BASE/debian || true
- docker build --cache-from $IMAGE_BASE/debian --tag $IMAGE_BASE/debian:$CI_COMMIT_SHA --tag $IMAGE_BASE/debian:latest -f Dockerfile.debian . - docker build --cache-from $IMAGE_BASE/debian --tag $IMAGE_BASE/debian:$CI_COMMIT_SHA --tag $IMAGE_BASE/debian:latest -f Dockerfile.debian .
rules: rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners" - if: $CI_COMMIT_BRANCH != "master"
changes: changes:
- Dockerfile.debian - Dockerfile.debian
@ -37,7 +39,7 @@ test-ubuntu:
- docker pull $IMAGE_BASE/ubuntu || true - docker pull $IMAGE_BASE/ubuntu || true
- docker build --cache-from $IMAGE_BASE/ubuntu --tag $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA --tag $IMAGE_BASE/ubuntu:latest -f Dockerfile.ubuntu . - docker build --cache-from $IMAGE_BASE/ubuntu --tag $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA --tag $IMAGE_BASE/ubuntu:latest -f Dockerfile.ubuntu .
rules: rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners" - if: $CI_COMMIT_BRANCH != "master"
changes: changes:
- Dockerfile.ubuntu - Dockerfile.ubuntu
@ -47,7 +49,7 @@ test-fedora:
- docker pull $IMAGE_BASE/fedora || true - docker pull $IMAGE_BASE/fedora || true
- docker build --cache-from $IMAGE_BASE/fedora --tag $IMAGE_BASE/fedora:$CI_COMMIT_SHA --tag $IMAGE_BASE/fedora:latest -f Dockerfile.fedora . - docker build --cache-from $IMAGE_BASE/fedora --tag $IMAGE_BASE/fedora:$CI_COMMIT_SHA --tag $IMAGE_BASE/fedora:latest -f Dockerfile.fedora .
rules: rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners" - if: $CI_COMMIT_BRANCH != "master"
changes: changes:
- Dockerfile.fedora - Dockerfile.fedora
@ -57,7 +59,7 @@ test-arch:
- docker pull $IMAGE_BASE/arch || true - docker pull $IMAGE_BASE/arch || true
- docker build --cache-from $IMAGE_BASE/arch --tag $IMAGE_BASE/arch:$CI_COMMIT_SHA --tag $IMAGE_BASE/arch:latest -f Dockerfile.arch . - docker build --cache-from $IMAGE_BASE/arch --tag $IMAGE_BASE/arch:$CI_COMMIT_SHA --tag $IMAGE_BASE/arch:latest -f Dockerfile.arch .
rules: rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners" - if: $CI_COMMIT_BRANCH != "master"
changes: changes:
- Dockerfile.arch - Dockerfile.arch
@ -67,7 +69,7 @@ test-angular:
- docker pull $IMAGE_BASE/angular || true - docker pull $IMAGE_BASE/angular || true
- docker build --cache-from $IMAGE_BASE/angular --tag $IMAGE_BASE/angular:$CI_COMMIT_SHA --tag $IMAGE_BASE/angular:latest -f Dockerfile.angular . - docker build --cache-from $IMAGE_BASE/angular --tag $IMAGE_BASE/angular:$CI_COMMIT_SHA --tag $IMAGE_BASE/angular:latest -f Dockerfile.angular .
rules: rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners" - if: $CI_COMMIT_BRANCH != "master"
changes: changes:
- Dockerfile.angular - Dockerfile.angular
@ -77,7 +79,7 @@ test-documentation:
- docker pull $IMAGE_BASE/documentation || true - docker pull $IMAGE_BASE/documentation || true
- docker build --cache-from $IMAGE_BASE/documentation --tag $IMAGE_BASE/documentation:$CI_COMMIT_SHA --tag $IMAGE_BASE/documentation:latest -f Dockerfile.documentation . - docker build --cache-from $IMAGE_BASE/documentation --tag $IMAGE_BASE/documentation:$CI_COMMIT_SHA --tag $IMAGE_BASE/documentation:latest -f Dockerfile.documentation .
rules: rules:
- if: $CI_COMMIT_BRANCH != "master" && $CI_PROJECT_PATH != "openlp/runners" - if: $CI_COMMIT_BRANCH != "master"
changes: changes:
- Dockerfile.documentation - Dockerfile.documentation
@ -89,10 +91,9 @@ build-debian:
- docker push $IMAGE_BASE/debian:$CI_COMMIT_SHA - docker push $IMAGE_BASE/debian:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/debian:latest - docker push $IMAGE_BASE/debian:latest
rules: rules:
- if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners" - if: $CI_COMMIT_BRANCH == "master"
changes: changes:
- Dockerfile.debian - Dockerfile.debian
- when: manual
build-ubuntu: build-ubuntu:
stage: build stage: build
@ -102,10 +103,9 @@ build-ubuntu:
- docker push $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA - docker push $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/ubuntu:latest - docker push $IMAGE_BASE/ubuntu:latest
rules: rules:
- if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners" - if: $CI_COMMIT_BRANCH == "master"
changes: changes:
- Dockerfile.ubuntu - Dockerfile.ubuntu
- when: manual
build-fedora: build-fedora:
stage: build stage: build
@ -115,10 +115,9 @@ build-fedora:
- docker push $IMAGE_BASE/fedora:$CI_COMMIT_SHA - docker push $IMAGE_BASE/fedora:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/fedora:latest - docker push $IMAGE_BASE/fedora:latest
rules: rules:
- if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners" - if: $CI_COMMIT_BRANCH == "master"
changes: changes:
- Dockerfile.fedora - Dockerfile.fedora
- when: manual
build-arch: build-arch:
stage: build stage: build
@ -128,10 +127,9 @@ build-arch:
- docker push $IMAGE_BASE/arch:$CI_COMMIT_SHA - docker push $IMAGE_BASE/arch:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/arch:latest - docker push $IMAGE_BASE/arch:latest
rules: rules:
- if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners" - if: $CI_COMMIT_BRANCH == "master"
changes: changes:
- Dockerfile.arch - Dockerfile.arch
- when: manual
build-angular: build-angular:
stage: build stage: build
@ -141,10 +139,9 @@ build-angular:
- docker push $IMAGE_BASE/angular:$CI_COMMIT_SHA - docker push $IMAGE_BASE/angular:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/angular:latest - docker push $IMAGE_BASE/angular:latest
rules: rules:
- if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners" - if: $CI_COMMIT_BRANCH == "master"
changes: changes:
- Dockerfile.angular - Dockerfile.angular
- when: manual
build-documentation: build-documentation:
stage: build stage: build
@ -154,10 +151,9 @@ build-documentation:
- docker push $IMAGE_BASE/documentation:$CI_COMMIT_SHA - docker push $IMAGE_BASE/documentation:$CI_COMMIT_SHA
- docker push $IMAGE_BASE/documentation:latest - docker push $IMAGE_BASE/documentation:latest
rules: rules:
- if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "openlp/runners" - if: $CI_COMMIT_BRANCH == "master"
changes: changes:
- Dockerfile.documentation - Dockerfile.documentation
- when: manual
build-all: build-all:
stage: build stage: build
@ -169,4 +165,5 @@ build-all:
docker push $IMAGE_BASE/$NAME:$CI_COMMIT_SHA docker push $IMAGE_BASE/$NAME:$CI_COMMIT_SHA
docker push $IMAGE_BASE/$NAME:latest docker push $IMAGE_BASE/$NAME:latest
done done
when: manual rules:
- when: manual

2
Dockerfile.angular
View File

@ -1,3 +1,3 @@
FROM alpine:3.19 FROM alpine:3.19
RUN apk add chromium git openssh-client xvfb-run yarn zip RUN apk add chromium git npm openssh-client xvfb-run yarn zip