gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-21 23:00:42 -08:00
Code Issues Packages Projects Releases Wiki Activity

test: fixed integration tests after updating testcontainers to v0.13.0 (#2208)

Browse Source
This commit is contained in:
DmitriyLewen
2022-05-31 13:49:24 +06:00
committed by GitHub
parent 6fd1887e64
commit 911c5e971a
3 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
integration/registry_test.go
View File

@@ -57,9 +57,9 @@ func setupRegistry(ctx context.Context, baseDir string, authURL *url.URL) (testc
"REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE": "/certs/cert.pem",
"REGISTRY_AUTH_TOKEN_AUTOREDIRECT": "false",
},
BindMounts: map[string]string{
"/certs": filepath.Join(baseDir, "data", "certs"),
},
Mounts: testcontainers.Mounts(
testcontainers.BindMount(filepath.Join(baseDir, "data", "certs"), "/certs"),
),
SkipReaper: true,
AutoRemove: true,
WaitingFor: wait.ForLog("listening on [::]:5443"),
@@ -77,10 +77,10 @@ func setupAuthServer(ctx context.Context, baseDir string) (testcontainers.Contai
Name: "docker_auth",
Image: authImage,
ExposedPorts: []string{authPort},
BindMounts: map[string]string{
"/config": filepath.Join(baseDir, "data", "auth_config"),
"/certs": filepath.Join(baseDir, "data", "certs"),
},
Mounts: testcontainers.Mounts(
testcontainers.BindMount(filepath.Join(baseDir, "data", "auth_config"), "/config"),
testcontainers.BindMount(filepath.Join(baseDir, "data", "certs"), "/certs"),
),
SkipReaper: true,
AutoRemove: true,
Cmd: []string{"/config/config.yml"},