github actions refactoring

.github/workflows/autotest-bunkerized-nginx-autoconf.yml

@@ -1,26 +0,0 @@
-name: Automatic test on autoconf
-
-on:
-  push:
-    branches: [dev, master]
-  pull_request:
-    branches: [dev, master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-      - name: Build the image
-        run: docker build -t autotest-autoconf -f autoconf/Dockerfile .
-      - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'autotest-autoconf'
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
-
-

.github/workflows/autotest-bunkerized-nginx-ui.yml

@@ -1,26 +0,0 @@
-name: Automatic test on ui
-
-on:
-  push:
-    branches: [dev, master]
-  pull_request:
-    branches: [dev, master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-      - name: Build the image
-        run: docker build -t autotest-ui -f ui/Dockerfile .
-      - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'autotest-ui'
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
-
-

.github/workflows/autotest-bunkerized-nginx.yml

@@ -1,26 +0,0 @@
-name: Automatic test
-
-on:
-  push:
-    branches: [dev, master]
-  pull_request:
-    branches: [dev, master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-      - name: Build the image
-        run: docker build -t autotest .
-      - name: Run autotest
-        run: docker run autotest test
-      - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'autotest'
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'

.github/workflows/build-bunkerized-nginx-autoconf.yml

@@ -23,13 +23,70 @@ jobs:
       - name: Setup Buildx
         uses: docker/setup-buildx-action@v1
 
+      - name: Setup Docker cache
+        uses: actions/cache@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build and push (dev)
+      - name: Build (dev)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: false
+          tags: bunkerity/bunkerized-nginx-autoconf:dev
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
+
+      - name: Move Docker cache
+        if: github.ref == 'refs/heads/dev'
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+      - name: Build (master)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/master'
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: false
+          tags: bunkerity/bunkerized-nginx-autoconf:latest,bunkerity/bunkerized-nginx-autoconf:${{ env.VERSION }}
+
+      - name: Run Trivy security scanner (dev)
+        if: github.ref == 'refs/heads/dev'
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'bunkerity/bunkerized-nginx-autoconf:dev'
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
+
+      - name: Run Trivy security scanner (master)
+        if: github.ref == 'refs/heads/master'
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'bunkerity/bunkerized-nginx-autoconf'
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
+
+      - name: Push (dev)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/dev'
         with:
@@ -38,8 +95,9 @@ jobs:
           platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
           push: true
           tags: bunkerity/bunkerized-nginx-autoconf:dev
+          cache-from: type=local,src=/tmp/.buildx-cache
 
-      - name: Build and push (master)
+      - name: Push (master)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/master'
         with:

.github/workflows/build-bunkerized-nginx-ui.yml

@@ -23,13 +23,70 @@ jobs:
       - name: Setup Buildx
         uses: docker/setup-buildx-action@v1
 
+      - name: Setup Docker cache
+        uses: actions/cache@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build and push (dev)
+      - name: Build (dev)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: false
+          tags: bunkerity/bunkerized-nginx-ui:dev
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
+
+      - name: Move Docker cache
+        if: github.ref == 'refs/heads/dev'
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+      - name: Build (master)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/master'
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: false
+          tags: bunkerity/bunkerized-nginx-ui:latest,bunkerity/bunkerized-nginx-ui:${{ env.VERSION }}
+
+      - name: Run Trivy security scanner (dev)
+        if: github.ref == 'refs/heads/dev'
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'bunkerity/bunkerized-nginx-ui:dev'
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
+
+      - name: Run Trivy security scanner (master)
+        if: github.ref == 'refs/heads/master'
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'bunkerity/bunkerized-nginx-ui'
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
+
+      - name: Push (dev)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/dev'
         with:
@@ -38,8 +95,9 @@ jobs:
           platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
           push: true
           tags: bunkerity/bunkerized-nginx-ui:dev
+          cache-from: type=local,src=/tmp/.buildx-cache
 
-      - name: Build and push (master)
+      - name: Push (master)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/master'
         with:

.github/workflows/build-bunkerized-nginx.yml

@@ -38,13 +38,13 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build and push (dev)
+      - name: Build (dev)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/dev'
         with:
           context: .
           platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
-          push: true
+          push: false
           tags: bunkerity/bunkerized-nginx:dev
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
@@ -55,7 +55,54 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-      - name: Build and push (master)
+      - name: Build (master)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/master'
+        with:
+          context: .
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: false
+          tags: bunkerity/bunkerized-nginx:latest,bunkerity/bunkerized-nginx:${{ env.VERSION }}
+
+      - name: Run autotest (dev)
+        if: github.ref == 'refs/heads/dev'
+        run: docker run bunkerity/bunkerized-nginx:dev test
+
+      - name: Run autotest (master)
+        if: github.ref == 'refs/heads/master'
+        run: docker run bunkerity/bunkerized-nginx test
+
+      - name: Run Trivy security scanner (dev)
+        if: github.ref == 'refs/heads/dev'
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'bunkerity/bunkerized-nginx:dev'
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
+
+      - name: Run Trivy security scanner (master)
+        if: github.ref == 'refs/heads/master'
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'bunkerity/bunkerized-nginx'
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
+
+      - name: Push (dev)
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/dev'
+        with:
+          context: .
+          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
+          push: true
+          tags: bunkerity/bunkerized-nginx:dev
+          cache-from: type=local,src=/tmp/.buildx-cache
+
+      - name: Push (master)
         uses: docker/build-push-action@v2
         if: github.ref == 'refs/heads/master'
         with: