Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

chore: abstract image pulling (backport #1137) #1139

Merged
mdelapenya merged 2 commits into from
May 6, 2021
Merged

chore: abstract image pulling (backport #1137) #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28f37b8
chore: abstract image pulling (#1137)
mdelapenya May 5, 2021
9794b62
Merge branch '7.13.x' into mergify/bp/7.13.x/pr-1137
mdelapenya May 6, 2021
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
15 changes: 13 additions & 2 deletions e2e/_suites/fleet/ingest_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,19 @@ func InitializeIngestManagerTestSuite(ctx *godog.TestSuiteContext) {
}

if !shell.GetEnvBool("SKIP_PULL") {
log.Info("Pulling Docker images...")
docker.PullImages(common.StackVersion, common.AgentVersion, common.KibanaVersion)
images := []string{
"docker.elastic.co/beats/elastic-agent:" + common.AgentVersion,
"docker.elastic.co/beats/elastic-agent-ubi8:" + common.AgentVersion,
"docker.elastic.co/elasticsearch/elasticsearch:" + common.StackVersion,
"docker.elastic.co/kibana/kibana:" + common.KibanaVersion,
"docker.elastic.co/observability-ci/elastic-agent:" + common.AgentVersion,
"docker.elastic.co/observability-ci/elastic-agent-ubi8:" + common.AgentVersion,
"docker.elastic.co/observability-ci/elasticsearch:" + common.StackVersion,
"docker.elastic.co/observability-ci/elasticsearch-ubi8:" + common.StackVersion,
"docker.elastic.co/observability-ci/kibana:" + common.KibanaVersion,
"docker.elastic.co/observability-ci/kibana-ubi8:" + common.KibanaVersion,
}
docker.PullImages(images)
}

common.ProfileEnv["kibanaDockerNamespace"] = "kibana"
Expand Down
16 changes: 3 additions & 13 deletions internal/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,21 +439,11 @@ func getDockerClient() *client.Client {
}

// PullImages pulls images
func PullImages(stackVersion, agentVersion, kibanaVersion string) error {
func PullImages(images []string) error {
c := getDockerClient()
ctx := context.Background()
images := []string{
"docker.elastic.co/beats/elastic-agent:" + agentVersion,
"docker.elastic.co/beats/elastic-agent-ubi8:" + agentVersion,
"docker.elastic.co/elasticsearch/elasticsearch:" + stackVersion,
"docker.elastic.co/kibana/kibana:" + kibanaVersion,
"docker.elastic.co/observability-ci/elastic-agent:" + agentVersion,
"docker.elastic.co/observability-ci/elastic-agent-ubi8:" + agentVersion,
"docker.elastic.co/observability-ci/elasticsearch:" + stackVersion,
"docker.elastic.co/observability-ci/elasticsearch-ubi8:" + stackVersion,
"docker.elastic.co/observability-ci/kibana:" + kibanaVersion,
"docker.elastic.co/observability-ci/kibana-ubi8:" + kibanaVersion,
}

log.WithField("images", images).Info("Pulling Docker images...")
for _, image := range images {
r, err := c.ImagePull(ctx, image, types.ImagePullOptions{})
if err != nil {
Expand Down