Merged PR 756491: feat: Download images from STACKIT container registry

Security-concept-update-needed: false.

JIRA Work Item: STACKITALO-211
This commit is contained in:
Christian Schaible (EXT) 2025-03-26 09:16:19 +00:00
parent 618be58a26
commit e8567c19ff
3 changed files with 15 additions and 9 deletions

View file

@ -21,6 +21,7 @@ stages:
- job: GoBuildTest - job: GoBuildTest
displayName: Run build and tests displayName: Run build and tests
variables: variables:
- group: artifactory-xx-sit-odj-sec-ident
- name: isCiBuild - name: isCiBuild
value: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')] value: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
steps: steps:
@ -80,6 +81,10 @@ stages:
condition: succeeded() condition: succeeded()
displayName: Check local changes after code generation and formatting 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 ./... - bash: go build ./...
condition: succeeded() condition: succeeded()
displayName: Build displayName: Build

View file

@ -8,6 +8,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/Azure/go-amqp" "github.com/Azure/go-amqp"
docker "github.com/docker/docker/api/types/container"
"github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/wait" "github.com/testcontainers/testcontainers-go/wait"
"io" "io"
@ -17,9 +18,8 @@ import (
"time" "time"
) )
const ( const AmqpQueuePrefix = "queue://"
AmqpQueuePrefix = "queue://" const dockerImage = "schwarzit-docker.jfrog.io/solace/solace-pubsub-standard:10.8.1.241"
)
var ErrResourceNotFound = errors.New("resource not found") var ErrResourceNotFound = errors.New("resource not found")
@ -132,12 +132,13 @@ func NewSolaceContainer(ctx context.Context) (*SolaceContainer, error) {
// Start docker container // Start docker container
request := testcontainers.ContainerRequest{ request := testcontainers.ContainerRequest{
Image: "solace/solace-pubsub-standard:10.8", Image: dockerImage,
ExposedPorts: []string{"5672/tcp", "8080/tcp"}, ExposedPorts: []string{"5672/tcp", "8080/tcp"},
SkipReaper: true, HostConfigModifier: func(config *docker.HostConfig) {
AutoRemove: true, config.AutoRemove = true
ShmSize: 1024 * 1024 * 1024, // 1 GB, },
Env: env, ShmSize: 1024 * 1024 * 1024, // 1 GB,
Env: env,
WaitingFor: wait.ForLog("Running pre-startup checks:"). WaitingFor: wait.ForLog("Running pre-startup checks:").
WithStartupTimeout(90 * time.Second), WithStartupTimeout(90 * time.Second),
} }

2
go.mod
View file

@ -6,6 +6,7 @@ require (
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.5-20250307204501-0409229c3780.1 buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.5-20250307204501-0409229c3780.1
github.com/Azure/go-amqp v1.4.0 github.com/Azure/go-amqp v1.4.0
github.com/bufbuild/protovalidate-go v0.9.2 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/google/uuid v1.6.0
github.com/lestrrat-go/jwx/v2 v2.1.4 github.com/lestrrat-go/jwx/v2 v2.1.4
github.com/rs/zerolog v1.33.0 github.com/rs/zerolog v1.33.0
@ -30,7 +31,6 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
github.com/distribution/reference v0.6.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-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect