From 1d0c8eff7fd7259508f4e444e729f551a9273c0a Mon Sep 17 00:00:00 2001
From: Florian Forster <florian@caos.ch>
Date: Fri, 3 Jul 2020 10:04:37 +0200
Subject: [PATCH] chore(dependabot): change dockerfile name (#338)

* chore(dependabot): change dockerfile name

* chore(build): fix file reference

* chore(anchore): dockerfilename

* chore(build): clean build file

* chore(build): fix dependant job

* chore(build): fix missing job
---
 .github/workflows/release.yml     | 38 ++++---------------------------
 build/docker/{prod => Dockerfile} |  0
 2 files changed, 4 insertions(+), 34 deletions(-)
 rename build/docker/{prod => Dockerfile} (100%)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 50aaeb726f..3eb56ed9f7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,20 +10,6 @@ env:
 
 jobs:
 
-  angular-test: # will be added later on
-    runs-on: ubuntu-18.04
-    defaults:
-      run:
-        working-directory: ./console
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
-      with:
-        node-version: ${{ env.NODE_VERSION }}
-    - run: npm ci
-    #- run: npm test 
-    - run: echo "replace me with real test"
-
   angular-lint: # will be added later on
     runs-on: ubuntu-18.04
     defaults:
@@ -83,7 +69,7 @@ jobs:
   
   go-build:
     runs-on: ubuntu-18.04
-    needs: [angular-build, angular-test, angular-lint, go-test] ### We need the artifact from the angular build and that's why we wait here
+    needs: [angular-build, angular-lint, go-test] ### We need the artifact from the angular build and that's why we wait here
     name: Build ${{ matrix.goos }}-${{ matrix.goarch }}
     strategy:
       matrix:
@@ -125,7 +111,7 @@ jobs:
         path: .artifacts
     - uses: docker/build-push-action@v1
       with:
-        dockerfile: build/docker/prod
+        dockerfile: build/docker/Dockerfile
         username: ${{ github.actor }}
         password: ${{ github.token }}
         registry: ${{ env.REGISTRY }}
@@ -149,7 +135,7 @@ jobs:
     - uses: anchore/scan-action@master
       with:
         image-reference: "${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE }}:${{ steps.vars.outputs.sha_short }}"
-        dockerfile-path: "./build/docker/prod"
+        dockerfile-path: "./build/docker/Dockerfile"
         fail-build: false
         acs-report-enable: true
     - name: Upload Anchore Scan Report
@@ -157,25 +143,9 @@ jobs:
       with:
         sarif_file: results.sarif
 
-  container-test:
-    runs-on: ubuntu-18.04
-    needs: container-prod
-    steps:
-    - name: Source checkout
-      uses: actions/checkout@v2
-    - name: Generate Short SHA Container Tag
-      id: vars
-      run: echo "::set-output name=sha_short::SHA-$(git rev-parse --short HEAD)"
-    - name: Check outputs
-      run: echo ${{ steps.vars.outputs.sha_short }}
-    - name: Docker Login
-      run: docker login $REGISTRY -u $GITHUB_ACTOR -p $GITHUB_TOKEN
-    - name: Docker Run Test
-      run: echo "replace me with real test"
-
   release:
     runs-on: ubuntu-18.04
-    needs: [container-prod, container-test]
+    needs: [container-prod]
     env:
       DOCKER_USERNAME: ${{ github.actor }}
       DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build/docker/prod b/build/docker/Dockerfile
similarity index 100%
rename from build/docker/prod
rename to build/docker/Dockerfile