Skip to content

Commit 2a32623

Browse files
committed
fix: Remove hardcoded values for harbor.sysdig-demo.zone
1 parent 8d71062 commit 2a32623

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

pkg/scanner/inline_adapter.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"crypto/md5"
66
"fmt"
7+
"net/url"
78
"time"
89

910
batchv1 "k8s.io/api/batch/v1"
@@ -63,6 +64,7 @@ func (i *inlineAdapter) createJobFrom(req harbor.ScanRequest) error {
6364

6465
func (i *inlineAdapter) buildJob(req harbor.ScanRequest) *batchv1.Job {
6566
name := jobName(req.Artifact.Repository, req.Artifact.Digest)
67+
repositoryURL, _ := url.Parse(req.Registry.URL)
6668

6769
return &batchv1.Job{
6870
ObjectMeta: metav1.ObjectMeta{
@@ -80,7 +82,7 @@ func (i *inlineAdapter) buildJob(req harbor.ScanRequest) *batchv1.Job {
8082
Command: []string{
8183
"sh",
8284
"-c",
83-
"mkdir -p /etc/docker/certs.d/harbor.sysdig-demo.zone && cp /tmp/ca.crt /etc/docker/certs.d/harbor.sysdig-demo.zone",
85+
fmt.Sprintf("mkdir -p /etc/docker/certs.d/%s && cp /tmp/ca.crt /etc/docker/certs.d/%s", repositoryURL.Host, repositoryURL.Host),
8486
},
8587
VolumeMounts: []corev1.VolumeMount{
8688
{
@@ -102,7 +104,7 @@ func (i *inlineAdapter) buildJob(req harbor.ScanRequest) *batchv1.Job {
102104
Command: []string{"/bin/bash"},
103105
Args: []string{
104106
"-c",
105-
fmt.Sprintf("docker login harbor.sysdig-demo.zone -u '$(HARBOR_ROBOTACCOUNT_USER)' -p '$(HARBOR_ROBOTACCOUNT_PASSWORD)' && (/bin/inline_scan.sh analyze -s '%s' -k '$(SYSDIG_SECURE_API_TOKEN)' -d '%s' -P %s || true )", i.secureURL, req.Artifact.Digest, getImageFrom(req)),
107+
fmt.Sprintf("docker login %s -u '$(HARBOR_ROBOTACCOUNT_USER)' -p '$(HARBOR_ROBOTACCOUNT_PASSWORD)' && (/bin/inline_scan.sh analyze -s '%s' -k '$(SYSDIG_SECURE_API_TOKEN)' -d '%s' -P %s || true )", repositoryURL.Host, i.secureURL, req.Artifact.Digest, getImageFrom(req)),
106108
},
107109
Env: []corev1.EnvVar{
108110
{

0 commit comments

Comments
 (0)