Make, CI: remove inband image build step

metal-toolbox · May 4, 2023 · f58e79c · f58e79c
1 parent af4e32d
commit f58e79c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/.github/workflows/push-pr-lint.yaml b/.github/workflows/push-pr-lint.yaml
@@ -8,24 +8,24 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v3
       with:
-        go-version: '1.19'
+        go-version: '1.20'
     - name: Checkout code
       uses: actions/checkout@v3
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v3
       with:
         args: --config .golangci.yml --timeout 2m
-        version: v1.50.0
+        version: v1.52.2
     - name: Test
       run: go test ./...
   build:
     runs-on: ubuntu-latest
     needs: [lint-test]
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.20'
 
       - name: Checkout code
         uses: actions/checkout@v3
@@ -44,15 +44,6 @@ jobs:
            push: false
            file: Dockerfile
 
-      - name: Build flasher inband Docker image - no push
-        id: dockerbuild-flasher-inband
-        uses: docker/build-push-action@v3
-        with:
-           context: .
-           push: false
-           tags: ghcr.io/metal-toolbox/flasher-inband:latest
-           file: Dockerfile.inband
-
       - name: Scan image - flasher
         id: scan-flasher-image
         uses: anchore/scan-action@v3
@@ -61,14 +52,6 @@ jobs:
           acs-report-enable: true
           fail-build: false
 
-      - name: Scan image - flasher inband
-        id: scan-flasher-inband-image
-        uses: anchore/scan-action@v3
-        with:
-          image: ghcr.io/metal-toolbox/flasher-inband:latest
-          acs-report-enable: true
-          fail-build: false
-
       - name: Inspect action SARIF report
         run: cat ${{ steps.scan.outputs.sarif }}
         if: always()
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,9 +27,9 @@ jobs:
           fetch-depth: 0
       -
         name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.20
       -
         name: install cosign
         uses: sigstore/cosign-installer@main

diff --git a/Makefile b/Makefile
@@ -41,12 +41,6 @@ build-image: build-linux
 							 --label org.label-schema.vcs-url=$(REPO)
 
 
-# build docker image, ignoring the cache
-build-image--nocache: build-linux
-	docker build --no-cache --rm=true -f Dockerfile.inband -t ${DOCKER_IMAGE}:latest  . \
-							 --label org.label-schema.schema-version=1.0 \
-							 --label org.label-schema.vcs-ref=$(GIT_COMMIT_FULL) \
-							 --label org.label-schema.vcs-url=$(REPO)
 
 ## build devel docker image
 build-image-devel: build-image