Run on github runners

.github/workflows/deploy-base.yaml

@@ -23,7 +23,7 @@ env:
 jobs:
   deploy:
     timeout-minutes: 10
-    runs-on: [self-hosted, ubuntu-focal]
+    runs-on: ubuntu-20.04
     environment:
       url: ${{ inputs.env_url }}
       name: ${{ inputs.env_name }}

.github/workflows/deploy-dev.yaml

@@ -9,7 +9,7 @@ on:
       - ".vscode/**"
 
 concurrency:
-  group: deploy-${{ github.ref }}
+  group: deploy-dev
   cancel-in-progress: true
 
 jobs:
@@ -30,17 +30,30 @@ jobs:
   test:
     uses: ditkrg/dit-digital-service-manual/.github/workflows/tests-base.yaml@dev
 
-  build:
+  build-push:
-    uses: ditkrg/common-github-workflows/.github/workflows/build-push-image.yaml@main
+    name: Build and Push
-    needs: [setup, test]
+    runs-on: ubuntu-20.04
+    timeout-minutes: 10
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Registry
+        uses: docker/login-action@v1
         with:
+          registry: reg.dev.krd
+          username: ${{ secrets.HARBOR_USER }}
+          password: ${{ secrets.HARBOR_TOKEN }}
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v2
+        with:
+          push: true
           tags: |-
             ${{ needs.setup.outputs.image }}
             ${{ needs.setup.outputs.image-sha }}
-      cache-from: type=registry,ref=${{ needs.setup.outputs.image }}
+          cache-from: type=registry,ref=${{ needs.setup.outputs.image }}-buildcache
-    secrets:
+          cache-to: type=registry,ref=${{ needs.setup.outputs.image }}-buildcache,mode=max
-      username: ${{ secrets.HARBOR_USER }}
-      password: ${{ secrets.HARBOR_TOKEN }}
 
   deploy:
     uses: ditkrg/dit-digital-service-manual/.github/workflows/deploy-base.yaml@dev

.github/workflows/deploy-production.yaml

@@ -28,17 +28,30 @@ jobs:
   test:
     uses: ditkrg/dit-digital-service-manual/.github/workflows/tests-base.yaml@main
 
-  build:
+  build-push:
-    uses: ditkrg/common-github-workflows/.github/workflows/build-push-image.yaml@main
+    name: Build and Push
-    needs: [setup, test]
+    runs-on: ubuntu-20.04
+    timeout-minutes: 10
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Registry
+        uses: docker/login-action@v1
         with:
+          registry: reg.dev.krd
+          username: ${{ secrets.HARBOR_USER }}
+          password: ${{ secrets.HARBOR_TOKEN }}
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v2
+        with:
+          push: true
           tags: |-
             ${{ needs.setup.outputs.image }}
             ${{ needs.setup.outputs.image-sha }}
-      cache-from: type=registry,ref=${{ needs.setup.outputs.image }}
+          cache-from: type=registry,ref=${{ needs.setup.outputs.image }}-buildcache
-    secrets:
+          cache-to: type=registry,ref=${{ needs.setup.outputs.image }}-buildcache,mode=max
-      username: ${{ secrets.HARBOR_USER }}
-      password: ${{ secrets.HARBOR_TOKEN }}
 
   deploy:
     uses: ditkrg/dit-digital-service-manual/.github/workflows/deploy-base.yaml@main