From e8567c19ffe21475a252486ddfddc9d44829f1a4 Mon Sep 17 00:00:00 2001
From: "Christian Schaible (EXT)"
 <Christian.Schaible_ext@external.mail.schwarz>
Date: Wed, 26 Mar 2025 09:16:19 +0000
Subject: [PATCH] Merged PR 756491: feat: Download images from STACKIT
 container registry

Security-concept-update-needed: false.

JIRA Work Item: STACKITALO-211
---
 .azuredevops/build-pipeline.yml |  5 +++++
 audit/messaging/solace.go       | 17 +++++++++--------
 go.mod                          |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.azuredevops/build-pipeline.yml b/.azuredevops/build-pipeline.yml
index 4963a72..3c7bc79 100644
--- a/.azuredevops/build-pipeline.yml
+++ b/.azuredevops/build-pipeline.yml
@@ -21,6 +21,7 @@ stages:
       - job: GoBuildTest
         displayName: Run build and tests
         variables:
+          - group: artifactory-xx-sit-odj-sec-ident
           - name: isCiBuild
             value: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
         steps:
@@ -80,6 +81,10 @@ stages:
             condition: succeeded()
             displayName: Check local changes after code generation and formatting
 
+          - script: echo "$(ARTIFACTORY_PASSWORD)" | docker login schwarzit-docker.jfrog.io --username $(ARTIFACTORY_USER) --password-stdin
+            displayName: 'Docker login'
+            condition: succeeded()
+
           - bash: go build ./...
             condition: succeeded()
             displayName: Build
diff --git a/audit/messaging/solace.go b/audit/messaging/solace.go
index 36e5922..52ad748 100644
--- a/audit/messaging/solace.go
+++ b/audit/messaging/solace.go
@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/Azure/go-amqp"
+	docker "github.com/docker/docker/api/types/container"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 	"io"
@@ -17,9 +18,8 @@ import (
 	"time"
 )
 
-const (
-	AmqpQueuePrefix = "queue://"
-)
+const AmqpQueuePrefix = "queue://"
+const dockerImage = "schwarzit-docker.jfrog.io/solace/solace-pubsub-standard:10.8.1.241"
 
 var ErrResourceNotFound = errors.New("resource not found")
 
@@ -132,12 +132,13 @@ func NewSolaceContainer(ctx context.Context) (*SolaceContainer, error) {
 
 	// Start docker container
 	request := testcontainers.ContainerRequest{
-		Image:        "solace/solace-pubsub-standard:10.8",
+		Image:        dockerImage,
 		ExposedPorts: []string{"5672/tcp", "8080/tcp"},
-		SkipReaper:   true,
-		AutoRemove:   true,
-		ShmSize:      1024 * 1024 * 1024, // 1 GB,
-		Env:          env,
+		HostConfigModifier: func(config *docker.HostConfig) {
+			config.AutoRemove = true
+		},
+		ShmSize: 1024 * 1024 * 1024, // 1 GB,
+		Env:     env,
 		WaitingFor: wait.ForLog("Running pre-startup checks:").
 			WithStartupTimeout(90 * time.Second),
 	}
diff --git a/go.mod b/go.mod
index ff2ecdf..fc33080 100644
--- a/go.mod
+++ b/go.mod
@@ -6,6 +6,7 @@ require (
 	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.5-20250307204501-0409229c3780.1
 	github.com/Azure/go-amqp v1.4.0
 	github.com/bufbuild/protovalidate-go v0.9.2
+	github.com/docker/docker v28.0.1+incompatible
 	github.com/google/uuid v1.6.0
 	github.com/lestrrat-go/jwx/v2 v2.1.4
 	github.com/rs/zerolog v1.33.0
@@ -30,7 +31,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v28.0.1+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect