Fix PR action for docker build (FoundationDB#2225)

* Fix PR action for docker build

* Update go 1.23.6

* Disable trivy for now

Author: johscheuer

.github/workflows/pull_request.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.23.5
+          go-version: 1.23.6
       - name: Get dependencies
         run: curl -L --fail "https://github.com/apple/foundationdb/releases/download/${FDB_VER}/foundationdb-clients_${FDB_VER}-1_amd64.deb" -o fdb.deb
       - name: Install dependencies
@@ -42,7 +42,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.23.5
+        go-version: 1.23.6
     - name: Fetch all tags
       run: git fetch --force --tags
     - name: Get dependencies
@@ -103,7 +103,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.23.5
+        go-version: 1.23.6
     - name: Fetch all tags
       run: git fetch --force --tags
     - name: Get dependencies
@@ -128,10 +128,12 @@ jobs:
           - fdb-kubernetes-operator
           - fdb-data-loader
         include:
-          - context: ./
+          - image: fdb-kubernetes-operator
+            context: ./
             name: foundationdb/fdb-kubernetes-operator
             file: ./Dockerfile
-          - context: ./sample-apps/data-loader
+          - image: fdb-data-loader
+            context: ./sample-apps/data-loader
             name: foundationdb/fdb-data-loader
             file: ./sample-apps/data-loader/Dockerfile
     steps:
@@ -154,14 +156,14 @@ jobs:
           context: ${{ matrix.context }}
           tags: ${{ matrix.name }}:latest
           file: ${{ matrix.file }}
-      - name: Run Trivy vulnerability scanner
-        if: ${{ matrix.name == 'foundationdb/fdb-kubernetes-operator' }}
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: "docker.io/${{ matrix.name }}:latest"
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          vuln-type: 'os,library'
-          severity: 'CRITICAL,HIGH'
-
+#      Disable trivy for now as it reports already fixed vulnerabilites
+#      - name: Run Trivy vulnerability scanner
+#        if: ${{ matrix.name == 'foundationdb/fdb-kubernetes-operator' }}
+#        uses: aquasecurity/trivy-action@master
+#        with:
+#          image-ref: "docker.io/${{ matrix.name }}:latest"
+#          format: 'table'
+#          exit-code: '1'
+#          ignore-unfixed: true
+#          vuln-type: 'os,library'
+#          severity: 'CRITICAL,HIGH'

.github/workflows/release.yaml

@@ -43,7 +43,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.23.5
+          go-version: 1.23.6
       #  https://github.com/goreleaser/goreleaser/issues/1311
       - name: Get current semver tag
         run: echo "::set-output name=CURRENT_TAG::$(git describe --tags --match "v*" --abbrev=0)"

Dockerfile

@@ -2,7 +2,7 @@ ARG FDB_VERSION=7.1.67
 ARG FDB_WEBSITE=https://github.com/apple/foundationdb/releases/download
 
 # Build the manager binary
-FROM docker.io/library/golang:1.23.5 AS builder
+FROM docker.io/library/golang:1.23.6 AS builder
 
 ARG FDB_VERSION
 ARG FDB_WEBSITE

go.mod

@@ -1,6 +1,6 @@
 module github.com/FoundationDB/fdb-kubernetes-operator/v2
 
-go 1.22
+go 1.22.7
 
 require (
 	// Binding version for 7.1.67