Skip to content

Commit

Permalink
Merge pull request #7294 from Checkmarx/ruiar/add-new-cx-image
Browse files Browse the repository at this point in the history
update(dockerfile): add new cx image
  • Loading branch information
cx-ruiaraujo authored Nov 6, 2024
2 parents f7ee165 + 8cac40d commit 67de28c
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 57 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cgr.dev/chainguard/go@sha256:ef5ed415d03d60169f72db591ac2f7fc3f8dd8de388956dd9355793601544463 as build_env
FROM checkmarx/go:1.23.1-r0@sha256:61d8f083c9781614cad318dc8a0b35fb2b9c7f88226829f4a5bdc00117c47cc2 AS build_env

# Copy the source from the current directory to the Working Directory inside the container
WORKDIR /app
Expand Down Expand Up @@ -29,7 +29,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
# Runtime image
# Ignore no User Cmd since KICS container is stopped afer scan
# kics-scan ignore-line
FROM cgr.dev/chainguard/git@sha256:0663e8c8a5c6fcad6cc2c08e7668d7b46f7aee025a923cee19f69475e187752a
FROM checkmarx/git@sha256:a4253a0291cec1dab3c4e85ccfd0c49d8c6d4a52e34c9159a59cb6a5fc7b4432

ENV TERM xterm-256color

Expand Down
25 changes: 9 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@ module github.com/Checkmarx/kics/v2

go 1.23.1

replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.6.26
github.com/docker/cli => github.com/docker/cli v20.10.12+incompatible
github.com/jung-kurt/gofpdf => github.com/jung-kurt/gofpdf v1.16.3-0.20210918000319-0c885ad36193 // indirect
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2
github.com/spf13/afero => github.com/spf13/afero v1.2.2
golang.org/x/crypto => golang.org/x/crypto v0.21.1-0.20240404165943-d042a396a6de // indirect
google.golang.org/protobuf => google.golang.org/protobuf v1.33.0 // indirect
)

require (
code.cloudfoundry.org/bytefmt v0.0.0-20240604172014-5a751eb643b0
github.com/BurntSushi/toml v1.4.0
Expand All @@ -22,7 +12,7 @@ require (
github.com/bigkevmcd/go-configparser v0.0.0-20230427073640-c6b631f70126
github.com/cheggaaa/pb/v3 v3.1.5
github.com/emicklei/proto v1.13.2
github.com/getsentry/sentry-go v0.28.2-0.20240729102758-eb05e4b3014c
github.com/getsentry/sentry-go v0.29.2-0.20241029153937-ec151c768820
github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1
github.com/golang/mock v1.6.0
github.com/google/pprof v0.0.0-20240528025155-186aa0362fba
Expand Down Expand Up @@ -63,12 +53,15 @@ require (
cloud.google.com/go/iam v1.1.6 // indirect
cloud.google.com/go/storage v1.38.0 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/Microsoft/hcsshim v0.12.8 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/aws/aws-sdk-go v1.44.295 // indirect
github.com/aws/smithy-go v1.20.2 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/typeurl/v2 v2.1.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
Expand Down Expand Up @@ -230,13 +223,13 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.31.1
k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver v0.31.1 // indirect
k8s.io/apimachinery v0.31.1
k8s.io/apiserver v0.31.1 // indirect
k8s.io/apimachinery v0.31.2
k8s.io/apiserver v0.31.2 // indirect
k8s.io/cli-runtime v0.31.1 // indirect
k8s.io/client-go v0.31.1
k8s.io/component-base v0.31.1 // indirect
k8s.io/client-go v0.31.2
k8s.io/component-base v0.31.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kubectl v0.31.1 // indirect
Expand Down
Loading

0 comments on commit 67de28c

Please sign in to comment.