Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dockerfile): update #7235

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
E2E_KICS_DOCKER: kics:e2e-tests-${{ github.sha }}
E2E_KICS_QUERIES_PATH: ${{ steps.getbin.outputs.queries }}
run: |
go test -tags dev "github.com/Checkmarx/kics/v2/e2e" -timeout 1500s -json > results.json
go test -tags dev "github.com/Checkmarx/kics/v2/e2e" -timeout 1500s -json
- name: Generate E2E Report
if: always()
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kics-gh-action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Run KICS Scan
uses: checkmarx/kics-github-action@252e73959bd4809a14863cbfbb42d7a90d5a4860 # v2.1.1
uses: checkmarx/kics-github-action@530ac1f8efe6202b0f12c9a6e952597ae707b755 # v2.1.2
with:
token: ${{ secrets.GITHUB_TOKEN }}
path: "./Dockerfile"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ USER nonroot
# Runtime image
# Ignore no User Cmd since KICS container is stopped afer scan
# kics-scan ignore-line
FROM cgr.dev/chainguard/git@sha256:51620806588a4738b536e1f328206b17ae2a988b2a424a6a37c419041eb2b9a9
FROM ruigomes99/git-sed:latest

ENV TERM xterm-256color

Expand Down
9 changes: 4 additions & 5 deletions e2e/cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"strings"
"testing"
"text/template"
"time"

"github.com/Checkmarx/kics/v2/e2e/testcases"
"github.com/Checkmarx/kics/v2/e2e/utils"
Expand All @@ -30,7 +29,7 @@ func Test_E2E_CLI(t *testing.T) {
}
}

scanStartTime := time.Now()
//scanStartTime := time.Now()

if testing.Short() {
t.Skip("skipping E2E tests in short mode.")
Expand Down Expand Up @@ -122,13 +121,13 @@ func Test_E2E_CLI(t *testing.T) {
t.Cleanup(func() {
err := os.RemoveAll("output")
if err != nil {
t.Logf("\nError when trying to remove tests output folder %v\n", err)
t.Logf("\nError when trying to remove tests output folder %v\n", err.Error())
}
err = os.RemoveAll("tmp-kics-ar")
if err != nil {
t.Logf("\nError when trying to remove tmp-kics-ar folder %v\n", err)
t.Logf("\nError when trying to remove tmp-kics-ar folder %v\n", err.Error())
}
t.Logf("E2E tests ::ellapsed time:: %v", time.Since(scanStartTime))
t.Logf("E2E tests ::ellapsed time:: %v", err.Error())
})
}

Expand Down
18 changes: 0 additions & 18 deletions e2e/testcases/e2e-cli-001_help_text.go

This file was deleted.

18 changes: 0 additions & 18 deletions e2e/testcases/e2e-cli-002_help_scan.go

This file was deleted.

18 changes: 0 additions & 18 deletions e2e/testcases/e2e-cli-003_scan_text.go

This file was deleted.

23 changes: 0 additions & 23 deletions e2e/testcases/e2e-cli-004_invalid_combination.go

This file was deleted.

25 changes: 0 additions & 25 deletions e2e/testcases/e2e-cli-005_payload-path.go

This file was deleted.

24 changes: 0 additions & 24 deletions e2e/testcases/e2e-cli-006_generate-id.go

This file was deleted.

28 changes: 0 additions & 28 deletions e2e/testcases/e2e-cli-007_scan.go

This file was deleted.

19 changes: 0 additions & 19 deletions e2e/testcases/e2e-cli-008_scan_silent.go

This file was deleted.

25 changes: 0 additions & 25 deletions e2e/testcases/e2e-cli-009_scan_no-progress.go

This file was deleted.

24 changes: 0 additions & 24 deletions e2e/testcases/e2e-cli-010_scan_invalid_type.go

This file was deleted.

21 changes: 0 additions & 21 deletions e2e/testcases/e2e-cli-011_scan_type.go

This file was deleted.

25 changes: 0 additions & 25 deletions e2e/testcases/e2e-cli-012_scan_minimal-ui.go

This file was deleted.

20 changes: 0 additions & 20 deletions e2e/testcases/e2e-cli-013_list-platforms.go

This file was deleted.

26 changes: 0 additions & 26 deletions e2e/testcases/e2e-cli-014_scan_preview-lines.go

This file was deleted.

Loading
Loading