From b3185a8d18d5419bbd20d279c34e25592807b9ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= <j.wielicki@sotecware.net>
Date: Mon, 1 Feb 2021 16:16:50 +0100
Subject: [PATCH 1/2] Remove build job pushing to docker hub
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don’t want that, Snikket got its own build servers.
---
 .github/workflows/build-portal-image.yml      | 23 --------------
 .../workflows/build-portal-release-image.yml  | 31 -------------------
 2 files changed, 54 deletions(-)
 delete mode 100644 .github/workflows/build-portal-image.yml
 delete mode 100644 .github/workflows/build-portal-release-image.yml

diff --git a/.github/workflows/build-portal-image.yml b/.github/workflows/build-portal-image.yml
deleted file mode 100644
index e0d0582..0000000
--- a/.github/workflows/build-portal-image.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Docker image build
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build the Docker image
-      run: >-
-        docker build . \
-          --build-arg=BUILD_SERIES=dev \
-          --build-arg=BUILD_ID="$(echo "$GITHUB_SHA" | head -c 12)" \
-          --tag snikket/snikket-web-portal:dev
-    - name: Log into registry
-      run: echo "${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}" | docker login -u snikket --password-stdin
-    - name: Push the Docker image
-      run: docker push snikket/snikket-web-portal:dev
diff --git a/.github/workflows/build-portal-release-image.yml b/.github/workflows/build-portal-release-image.yml
deleted file mode 100644
index 63fa3cf..0000000
--- a/.github/workflows/build-portal-release-image.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Docker release image build
-
-"on":
-  push:
-    tags:
-      - release/*.*
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build the Docker image
-        run: >-
-          echo "Building ref $GITHUB_REF...";
-          RELEASE_TAG="${GITHUB_REF#refs/tags/release/}";
-          RELEASE_SERIES="${RELEASE_TAG%.*}";
-          RELEASE_VER="${RELEASE_TAG#$RELEASE_SERIES.}";
-          docker build . \
-            --build-arg=BUILD_SERIES="$RELEASE_SERIES" \
-            --build-arg=BUILD_ID="$RELEASE_VER" \
-            --tag snikket/snikket-web-portal:"$RELEASE_SERIES"
-      - name: Log into registry
-        run: echo "${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}" | docker login -u snikket --password-stdin
-      - name: Push the Docker image
-        run: >-
-          RELEASE_TAG="${GITHUB_REF#refs/tags/release/}";
-          RELEASE_SERIES="${RELEASE_TAG%.*}";
-          docker push snikket/snikket-web-portal:"$RELEASE_SERIES"

From 10a0de0637112cd45d2674896548636ddb1c7dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= <j.wielicki@sotecware.net>
Date: Mon, 1 Feb 2021 16:17:06 +0100
Subject: [PATCH 2/2] Add test build to standard CI

---
 .github/workflows/main.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 96a4052..1d9f283 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -48,3 +48,12 @@ jobs:
       - name: Linting
         run: |
           python -m flake8 snikket_web
+
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build the Docker image
+        run: >-
+          docker build .