Merge pull request #7124 from Checkmarx/fix-dockerfile

fix(dockerfiles): update dockerfiles constant mapping
Checkmarx · Jun 12, 2024 · 68f978c · 68f978c
2 parents 0d40293 + c6601a0
commit 68f978c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/.github/workflows/release-dkr-image.yml b/.github/workflows/release-dkr-image.yml
@@ -99,16 +99,3 @@ jobs:
       #    password: ${{ secrets.DOCKER_PASSWORD }}
       #    readme-filepath: docs/dockerhub.md
       #    repository: checkmarx/kics
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
-        with:
-          title: "docs(kicsbot): update images digest"
-          token: ${{ secrets.KICS_BOT_PAT }}
-          commit-message: "docs(kicsbot): update images digest"
-          delete-branch: true
-          branch: feature/kicsbot-update-queries-docs
-          body: |
-            **Automated Changes**
-            Updating docker images digests
-            Triggered by SHA: _${{ github.sha }}_
-          labels: documentation
diff --git a/Dockerfile b/Dockerfile
@@ -22,7 +22,7 @@ COPY . .
 
 # Build the Go app
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
-    -ldflags "-s -w -X github.com/Checkmarx/kics/internal/constants.Version=${VERSION} -X github.com/Checkmarx/kics/internal/constants.SCMCommit=${COMMIT} -X github.com/Checkmarx/kics/internal/constants.SentryDSN=${SENTRY_DSN} -X github.com/Checkmarx/kics/internal/constants.BaseURL=${DESCRIPTIONS_URL}" \
+    -ldflags "-s -w -X github.com/Checkmarx/kics/v2/internal/constants.Version=${VERSION} -X github.com/Checkmarx/kics/v2/internal/constants.SCMCommit=${COMMIT} -X github.com/Checkmarx/kics/v2/internal/constants.SentryDSN=${SENTRY_DSN} -X github.com/Checkmarx/kics/v2/internal/constants.BaseURL=${DESCRIPTIONS_URL}" \
     -a -installsuffix cgo \
     -o bin/kics cmd/console/main.go
 

diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian
@@ -28,7 +28,7 @@ USER root
 # Build the Go app
 RUN apt-get install -y ca-certificates
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
-  -ldflags "-s -w -X github.com/Checkmarx/kics/internal/constants.Version=${VERSION} -X github.com/Checkmarx/kics/internal/constants.SCMCommit=${COMMIT} -X github.com/Checkmarx/kics/internal/constants.SentryDSN=${SENTRY_DSN} -X github.com/Checkmarx/kics/internal/constants.BaseURL=${DESCRIPTIONS_URL}" \
+  -ldflags "-s -w -X github.com/Checkmarx/kics/v2/internal/constants.Version=${VERSION} -X github.com/Checkmarx/kics/v2/internal/constants.SCMCommit=${COMMIT} -X github.com/Checkmarx/kics/v2/internal/constants.SentryDSN=${SENTRY_DSN} -X github.com/Checkmarx/kics/v2/internal/constants.BaseURL=${DESCRIPTIONS_URL}" \
   -a -installsuffix cgo \
   -o bin/kics cmd/console/main.go
 

diff --git a/docker/Dockerfile.ubi8 b/docker/Dockerfile.ubi8
@@ -30,7 +30,7 @@ COPY . .
 
 # Build the Go app
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
-  -ldflags "-s -w -X github.com/Checkmarx/kics/internal/constants.Version=${VERSION} -X github.com/Checkmarx/kics/internal/constants.SCMCommit=${COMMIT} -X github.com/Checkmarx/kics/internal/constants.SentryDSN=${SENTRY_DSN} -X github.com/Checkmarx/kics/internal/constants.BaseURL=${DESCRIPTIONS_URL}" \
+  -ldflags "-s -w -X github.com/Checkmarx/kics/v2/internal/constants.Version=${VERSION} -X github.com/Checkmarx/kics/v2/internal/constants.SCMCommit=${COMMIT} -X github.com/Checkmarx/kics/v2/internal/constants.SentryDSN=${SENTRY_DSN} -X github.com/Checkmarx/kics/v2/internal/constants.BaseURL=${DESCRIPTIONS_URL}" \
   -a -installsuffix cgo \
   -o bin/kics cmd/console/main.go