revert 'reenable manual build

workflow and minor fixes' shouldn't be there
sirux88 · Sep 21, 2023 · 56c2d0e · 56c2d0e
1 parent b3793f4
commit 56c2d0e
Showing 1 changed file with 5 additions and 21 deletions.
diff --git a/.github/workflows/docker-containers.yml b/.github/workflows/docker-containers.yml
@@ -8,18 +8,12 @@ on:
       - "v*.*.*"
 
   workflow_dispatch:
-    inputs:
-      dockerPush:
-        description: 'Push image to docker hub?'
-        required: true
-        type: boolean
-        default: false
+
   schedule:
     # * is a special character in YAML so you have to quote this string
     # Run every day at 5:24 UTC - build 'latest' docker containers
     - cron: "24 17 * * *"
-env:
-  DOCKER_PUSH: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -33,10 +27,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Set DOCKER_PUSH for workflow_dispatch
-        if: ${{ github.event_name == 'workflow_dispatch' }}
-        run: echo "DOCKER_PUSH=${{ github.event.inputs.dockerPush }}" >> $GITHUB_ENV
-
       - name: Populate Docker metadata
         id: meta
         uses: docker/metadata-action@v4
@@ -55,7 +45,6 @@ jobs:
 
       - name: Login to DockerHub
         uses: docker/login-action@v2
-        if: ${{env.DOCKER_PUSH == 'true'}}
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -66,11 +55,11 @@ jobs:
           file: ./containers/docker/pwpush/Dockerfile
           platforms: linux/amd64,linux/arm64
           provenance: false
-          push: ${{env.DOCKER_PUSH == 'true'}}
+          push: true
           labels: ${{ steps.meta.outputs.labels }}
           tags: ${{ steps.meta.outputs.tags }}
           cache-from: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/pwpush:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/pwpush:buildcache,mode=max,ignore-error=${{env.DOCKER_PUSH == 'false'}}
+          cache-to: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/pwpush:buildcache,mode=max
 
   # 'buildObsolete'-job can be completly removed after dropping support 
   # for old docker images.
@@ -94,10 +83,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Set DOCKER_PUSH for workflow_dispatch
-        if: ${{ github.event_name == 'workflow_dispatch' }}
-        run: echo "DOCKER_PUSH=${{ github.event.inputs.dockerPush }}" >> $GITHUB_ENV
-
       - name: Populate Docker metadata
         id: meta
         uses: docker/metadata-action@v4
@@ -116,7 +101,6 @@ jobs:
 
       - name: Login to DockerHub
         uses: docker/login-action@v2
-        if: ${{env.DOCKER_PUSH == 'true'}}
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -127,7 +111,7 @@ jobs:
           file: ./containers/docker/pwpush-${{ matrix.dbType }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           provenance: false
-          push: ${{env.DOCKER_PUSH == 'true'}}
+          push: true
           labels: ${{ steps.meta.outputs.labels }}
           tags: ${{ steps.meta.outputs.tags }}
           build-args: |