From 657f0b7b8635057df7e504578080849b65def2a3 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Sun, 6 Oct 2019 00:26:28 +0000
Subject: [PATCH] Docker runner updates

- Add Angular runner image
- Add Arch runner image
- Only rebuild Docker images if the appropriate Dockerfile changes
---
 .gitlab-ci.yml     | 47 ++++++++++++++++++++++++++++++++++++++++++----
 Dockerfile.angular |  3 +++
 Dockerfile.arch    | 10 ++++++++++
 3 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 Dockerfile.angular
 create mode 100644 Dockerfile.arch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98ec379..45f3924 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,11 @@ build-debian:
     - docker push openlp/debian:$CI_COMMIT_SHA
     - docker push openlp/debian:latest
   only:
-    - master@openlp/runners
+    refs:
+      - master@openlp/runners
+    changes:
+      - Dockerfile.debian
+
 
 build-ubuntu:
   stage: build
@@ -28,7 +32,10 @@ build-ubuntu:
     - docker push openlp/ubuntu:$CI_COMMIT_SHA
     - docker push openlp/ubuntu:latest
   only:
-    - master@openlp/runners
+    refs:
+      - master@openlp/runners
+    changes:
+      - Dockerfile.ubuntu
 
 build-fedora:
   stage: build
@@ -38,7 +45,36 @@ build-fedora:
     - docker push openlp/fedora:$CI_COMMIT_SHA
     - docker push openlp/fedora:latest
   only:
-    - master@openlp/runners
+    refs:
+      - master@openlp/runners
+    changes:
+      - Dockerfile.fedora
+
+build-arch:
+  stage: build
+  script:
+    - docker pull openlp/arch || true
+    - docker build --cache-from openlp/arch --tag openlp/arch:$CI_COMMIT_SHA --tag openlp/arch:latest -f Dockerfile.arch .
+    - docker push openlp/arch:$CI_COMMIT_SHA
+    - docker push openlp/arch:latest
+  only:
+    refs:
+      - master@openlp/runners
+    changes:
+      - Dockerfile.arch
+
+build-angular:
+  stage: build
+  script:
+    - docker pull openlp/angular || true
+    - docker build --cache-from openlp/angular --tag openlp/angular:$CI_COMMIT_SHA --tag openlp/angular:latest -f Dockerfile.angular .
+    - docker push openlp/angular:$CI_COMMIT_SHA
+    - docker push openlp/angular:latest
+  only:
+    refs:
+      - master@openlp/runners
+    changes:
+      - Dockerfile.angular
 
 build-documentation:
   stage: build
@@ -48,4 +84,7 @@ build-documentation:
     - docker push openlp/documentation:$CI_COMMIT_SHA
     - docker push openlp/documentation:latest
   only:
-    - master@openlp/runners
+    refs:
+      - master@openlp/runners
+    changes:
+      - Dockerfile.documentation
diff --git a/Dockerfile.angular b/Dockerfile.angular
new file mode 100644
index 0000000..c9d7f5a
--- /dev/null
+++ b/Dockerfile.angular
@@ -0,0 +1,3 @@
+FROM alpine:latest
+
+RUN apk add yarn chromium xvfb-run
diff --git a/Dockerfile.arch b/Dockerfile.arch
new file mode 100644
index 0000000..8077375
--- /dev/null
+++ b/Dockerfile.arch
@@ -0,0 +1,10 @@
+FROM archlinux/base
+ENV LANG C.UTF-8
+
+RUN pacman -Syyu --noconfirm git python qt5-multimedia qt5-svg qt5-webengine qt5-webchannel qt5-tools python-pyqt5 \
+                             python-dbus python-sqlalchemy python-alembic python-chardet python-lxml python-pyenchant \
+                             python-beautifulsoup4 python-mako python-pytest python-pytest-cov python-websockets \
+                             python-webob python-waitress python-requests python-pymediainfo python-qtawesome \
+                             python-opengl python-appdirs python-zeroconf python-pip flake8 mediainfo mupdf-tools \
+                             xorg-server-xvfb pyalpm fakeroot patch awk
+RUN pip install python-vlc pysword