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

Add npm to the Angular image

See merge request openlp/runners!39

.gitlab-ci.yml

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

Dockerfile.angular

@@ -1,3 +1,3 @@
 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