uncomment workflows for ko

.github/workflows/release.yaml

@@ -8,8 +8,6 @@ on:
   push:
     tags:
     - 'v*'
-    branches:
-    - reports-server-fips-support
 
 jobs:
   release-reports-server:
@@ -27,114 +25,114 @@ jobs:
     secrets:
       registry_username: ${{ github.actor }}
       registry_password: ${{ secrets.GITHUB_TOKEN }}
-  # goreleaser:
+  goreleaser:
+    permissions:
+      contents: write
+      id-token: write
+      packages: write
+      pull-requests: write
+    outputs:
+      hashes: ${{ steps.hash.outputs.hashes }}
+      image: ${{ steps.digest.outputs.image }}
+      digest: ${{ steps.digest.outputs.digest }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Free disk space
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
+        with:
+          tool-cache: true
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: false
+          docker-images: true
+          swap-storage: false
+      - name: Checkout
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          fetch-depth: 0
+      - name: Fetch all tags
+        run: |
+          set -e
+          git fetch --force --tags
+      - name: Set up Go
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
+          cache-dependency-path: go.sum
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@e1523de7571e31dbe865fd2e80c5c7c23ae71eb4 # v3.4.0
+      - name: Install Syft
+        uses: anchore/sbom-action/download-syft@b6a39da80722a2cb0ef5d197531764a89b5d48c3 # v0.15.8
+      - name: Install Ko
+        uses: ko-build/setup-ko@ace48d793556083a76f1e3e6068850c1f4a369aa # v0.6
+      - name: Run GoReleaser
+        id: goreleaser
+        uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
+        with:
+          distribution: goreleaser
+          version: latest
+          args: release --clean --timeout 90m
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload artifacts.json
+        uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # 2.9.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: dist/artifacts.json
+          asset_name: artifacts.json
+          tag: ${{ github.ref }}
+      - name: Upload metadata.json
+        uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # 2.9.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: dist/metadata.json
+          asset_name: metadata.json
+          tag: ${{ github.ref }}
+      - name: Generate subject
+        id: hash
+        env:
+          ARTIFACTS: "${{ steps.goreleaser.outputs.artifacts }}"
+        run: |
+          set -euo pipefail
+          checksum_file=$(echo "$ARTIFACTS" | jq -r '.[] | select (.type=="Checksum") | .path')
+          hashes=$(cat $checksum_file | base64 -w0)
+          echo "hashes=$hashes" >> $GITHUB_OUTPUT
+      - name: Image digest
+        id: digest
+        env:
+          ARTIFACTS: "${{ steps.goreleaser.outputs.artifacts }}"
+        run: |
+          set -euo pipefail
+          image_and_digest=$(echo "$ARTIFACTS" | jq -r '.[] | select (.type=="Docker Manifest") | .path')
+          image=$(echo "${image_and_digest}" | cut -d'@' -f1 | cut -d':' -f1)
+          digest=$(echo "${image_and_digest}" | cut -d'@' -f2)
+          echo "image=$image" >> "$GITHUB_OUTPUT"
+          echo "digest=$digest" >> "$GITHUB_OUTPUT"
+
+  # provenance:
+  #   needs:
+  #     - goreleaser
   #   permissions:
+  #     actions: read
+  #     id-token: write
   #     contents: write
+  #   uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
+  #   with:
+  #     base64-subjects: "${{ needs.goreleaser.outputs.hashes }}"
+  #     upload-assets: true
+
+  # image-provenance:
+  #   needs:
+  #     - goreleaser
+  #   permissions:
+  #     actions: read
   #     id-token: write
   #     packages: write
-  #     pull-requests: write
-  #   outputs:
-  #     hashes: ${{ steps.hash.outputs.hashes }}
-  #     image: ${{ steps.digest.outputs.image }}
-  #     digest: ${{ steps.digest.outputs.digest }}
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Free disk space
-  #       uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
-  #       with:
-  #         tool-cache: true
-  #         android: true
-  #         dotnet: true
-  #         haskell: true
-  #         large-packages: false
-  #         docker-images: true
-  #         swap-storage: false
-  #     - name: Checkout
-  #       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-  #       with:
-  #         fetch-depth: 0
-  #     - name: Fetch all tags
-  #       run: |
-  #         set -e
-  #         git fetch --force --tags
-  #     - name: Set up Go
-  #       uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
-  #       with:
-  #         go-version-file: go.mod
-  #         cache-dependency-path: go.sum
-  #     - name: Install Cosign
-  #       uses: sigstore/cosign-installer@e1523de7571e31dbe865fd2e80c5c7c23ae71eb4 # v3.4.0
-  #     - name: Install Syft
-  #       uses: anchore/sbom-action/download-syft@b6a39da80722a2cb0ef5d197531764a89b5d48c3 # v0.15.8
-  #     - name: Install Ko
-  #       uses: ko-build/setup-ko@ace48d793556083a76f1e3e6068850c1f4a369aa # v0.6
-  #     - name: Run GoReleaser
-  #       id: goreleaser
-  #       uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
-  #       with:
-  #         distribution: goreleaser
-  #         version: latest
-  #         args: release --clean --timeout 90m
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #     - name: Upload artifacts.json
-  #       uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # 2.9.0
-  #       with:
-  #         repo_token: ${{ secrets.GITHUB_TOKEN }}
-  #         file: dist/artifacts.json
-  #         asset_name: artifacts.json
-  #         tag: ${{ github.ref }}
-  #     - name: Upload metadata.json
-  #       uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # 2.9.0
-  #       with:
-  #         repo_token: ${{ secrets.GITHUB_TOKEN }}
-  #         file: dist/metadata.json
-  #         asset_name: metadata.json
-  #         tag: ${{ github.ref }}
-  #     - name: Generate subject
-  #       id: hash
-  #       env:
-  #         ARTIFACTS: "${{ steps.goreleaser.outputs.artifacts }}"
-  #       run: |
-  #         set -euo pipefail
-  #         checksum_file=$(echo "$ARTIFACTS" | jq -r '.[] | select (.type=="Checksum") | .path')
-  #         hashes=$(cat $checksum_file | base64 -w0)
-  #         echo "hashes=$hashes" >> $GITHUB_OUTPUT
-  #     - name: Image digest
-  #       id: digest
-  #       env:
-  #         ARTIFACTS: "${{ steps.goreleaser.outputs.artifacts }}"
-  #       run: |
-  #         set -euo pipefail
-  #         image_and_digest=$(echo "$ARTIFACTS" | jq -r '.[] | select (.type=="Docker Manifest") | .path')
-  #         image=$(echo "${image_and_digest}" | cut -d'@' -f1 | cut -d':' -f1)
-  #         digest=$(echo "${image_and_digest}" | cut -d'@' -f2)
-  #         echo "image=$image" >> "$GITHUB_OUTPUT"
-  #         echo "digest=$digest" >> "$GITHUB_OUTPUT"
-
-  # # provenance:
-  # #   needs:
-  # #     - goreleaser
-  # #   permissions:
-  # #     actions: read
-  # #     id-token: write
-  # #     contents: write
-  # #   uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
-  # #   with:
-  # #     base64-subjects: "${{ needs.goreleaser.outputs.hashes }}"
-  # #     upload-assets: true
-
-  # # image-provenance:
-  # #   needs:
-  # #     - goreleaser
-  # #   permissions:
-  # #     actions: read
-  # #     id-token: write
-  # #     packages: write
-  # #   uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
-  # #   with:
-  # #     image: ${{ needs.goreleaser.outputs.image }}
-  # #     digest: ${{ needs.goreleaser.outputs.digest }}
-  # #     registry-username: ${{ github.actor }}
-  # #   secrets:
-  # #     registry-password: ${{ secrets.GITHUB_TOKEN }}
+  #   uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
+  #   with:
+  #     image: ${{ needs.goreleaser.outputs.image }}
+  #     digest: ${{ needs.goreleaser.outputs.digest }}
+  #     registry-username: ${{ github.actor }}
+  #   secrets:
+  #     registry-password: ${{ secrets.GITHUB_TOKEN }}

Dockerfile.fips

@@ -42,4 +42,4 @@ COPY --from=builder /etc/ssl/certs /etc/ssl/certs
 
 USER 1001
 
-ENTRYPOINT ["/reports-server"]
+ENTRYPOINT ["/reports-server"]

Makefile

@@ -298,8 +298,7 @@ ko-publish-reports-server: ko-login ## Build and publish reports-server image (w
 FIPS_ENABLED := 0 # Default to FIPS disabled
 
 ifeq ($(FIPS_ENABLED), 1)
-# IMAGE_TAG    := $(shell git describe --tags --abbrev=0)
-IMAGE_TAG    := "amit-fips"
+IMAGE_TAG    := $(shell git describe --tags --abbrev=0)
 BUILD_TAGS   :="fips" 
 LD_FLAGS     :="-s -w"
 CGO_ENABLED  := 1

rs

@@ -0,0 +1,140 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+
+name: Release
+
+permissions: {}
+
+on:
+  push:
+    tags:
+    - 'v*'
+    branches:
+    - reports-server-fips-support
+
+jobs:
+  release-reports-server:
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    uses: ./.github/workflows/reuse.yaml
+    with:
+      publish_command: docker-publish-reports-server-fips
+      digest_command: docker-get-reports-server-digest
+      image_name: reports-server-fips
+      tag: release
+      main: ./
+    secrets:
+      registry_username: ${{ github.actor }}
+      registry_password: ${{ secrets.GITHUB_TOKEN }}
+  # goreleaser:
+  #   permissions:
+  #     contents: write
+  #     id-token: write
+  #     packages: write
+  #     pull-requests: write
+  #   outputs:
+  #     hashes: ${{ steps.hash.outputs.hashes }}
+  #     image: ${{ steps.digest.outputs.image }}
+  #     digest: ${{ steps.digest.outputs.digest }}
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Free disk space
+  #       uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
+  #       with:
+  #         tool-cache: true
+  #         android: true
+  #         dotnet: true
+  #         haskell: true
+  #         large-packages: false
+  #         docker-images: true
+  #         swap-storage: false
+  #     - name: Checkout
+  #       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Fetch all tags
+  #       run: |
+  #         set -e
+  #         git fetch --force --tags
+  #     - name: Set up Go
+  #       uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+  #       with:
+  #         go-version-file: go.mod
+  #         cache-dependency-path: go.sum
+  #     - name: Install Cosign
+  #       uses: sigstore/cosign-installer@e1523de7571e31dbe865fd2e80c5c7c23ae71eb4 # v3.4.0
+  #     - name: Install Syft
+  #       uses: anchore/sbom-action/download-syft@b6a39da80722a2cb0ef5d197531764a89b5d48c3 # v0.15.8
+  #     - name: Install Ko
+  #       uses: ko-build/setup-ko@ace48d793556083a76f1e3e6068850c1f4a369aa # v0.6
+  #     - name: Run GoReleaser
+  #       id: goreleaser
+  #       uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
+  #       with:
+  #         distribution: goreleaser
+  #         version: latest
+  #         args: release --clean --timeout 90m
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Upload artifacts.json
+  #       uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # 2.9.0
+  #       with:
+  #         repo_token: ${{ secrets.GITHUB_TOKEN }}
+  #         file: dist/artifacts.json
+  #         asset_name: artifacts.json
+  #         tag: ${{ github.ref }}
+  #     - name: Upload metadata.json
+  #       uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # 2.9.0
+  #       with:
+  #         repo_token: ${{ secrets.GITHUB_TOKEN }}
+  #         file: dist/metadata.json
+  #         asset_name: metadata.json
+  #         tag: ${{ github.ref }}
+  #     - name: Generate subject
+  #       id: hash
+  #       env:
+  #         ARTIFACTS: "${{ steps.goreleaser.outputs.artifacts }}"
+  #       run: |
+  #         set -euo pipefail
+  #         checksum_file=$(echo "$ARTIFACTS" | jq -r '.[] | select (.type=="Checksum") | .path')
+  #         hashes=$(cat $checksum_file | base64 -w0)
+  #         echo "hashes=$hashes" >> $GITHUB_OUTPUT
+  #     - name: Image digest
+  #       id: digest
+  #       env:
+  #         ARTIFACTS: "${{ steps.goreleaser.outputs.artifacts }}"
+  #       run: |
+  #         set -euo pipefail
+  #         image_and_digest=$(echo "$ARTIFACTS" | jq -r '.[] | select (.type=="Docker Manifest") | .path')
+  #         image=$(echo "${image_and_digest}" | cut -d'@' -f1 | cut -d':' -f1)
+  #         digest=$(echo "${image_and_digest}" | cut -d'@' -f2)
+  #         echo "image=$image" >> "$GITHUB_OUTPUT"
+  #         echo "digest=$digest" >> "$GITHUB_OUTPUT"
+
+  # # provenance:
+  # #   needs:
+  # #     - goreleaser
+  # #   permissions:
+  # #     actions: read
+  # #     id-token: write
+  # #     contents: write
+  # #   uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
+  # #   with:
+  # #     base64-subjects: "${{ needs.goreleaser.outputs.hashes }}"
+  # #     upload-assets: true
+
+  # # image-provenance:
+  # #   needs:
+  # #     - goreleaser
+  # #   permissions:
+  # #     actions: read
+  # #     id-token: write
+  # #     packages: write
+  # #   uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
+  # #   with:
+  # #     image: ${{ needs.goreleaser.outputs.image }}
+  # #     digest: ${{ needs.goreleaser.outputs.digest }}
+  # #     registry-username: ${{ github.actor }}
+  # #   secrets:
+  # #     registry-password: ${{ secrets.GITHUB_TOKEN }}