Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion internal/services/icinga2/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (i *dockerCreator) CreateIcinga2(name string) services.Icinga2Base {
panic(err)
}

dockerImage := utils.GetEnvDefault("ICINGA_TESTING_ICINGA2_IMAGE", "icinga/icinga2:master")
dockerImage := utils.GetEnvDefault("ICINGA_TESTING_ICINGA2_IMAGE", "icinga/icinga2:edge")
err = utils.DockerImagePull(context.Background(), logger, i.dockerClient, dockerImage, false)
if err != nil {
panic(err)
Expand Down
4 changes: 2 additions & 2 deletions it.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// the Docker API to start and stop containers locally as required by the tests.
//
// The following environment variables are used by icinga-testing:
// - ICINGA_TESTING_ICINGA2_IMAGE: Icinga 2 container image to use (default: "icinga/icinga2:master")
// - ICINGA_TESTING_ICINGA2_IMAGE: Icinga 2 container image to use (default: "icinga/icinga2:edge")
// - ICINGA_TESTING_MYSQL_IMAGE: MySQL/MariaDB container image to use (default: "mysql:latest")
// - ICINGA_TESTING_PGSQL_IMAGE: PostgreSQL container image to use (default: "postgres:latest")
// - ICINGA_TESTING_REDIS_IMAGE: Redis container image to use (default: "redis:latest")
Expand Down Expand Up @@ -240,7 +240,7 @@ func (it *IT) getIcinga2() icinga2.Creator {

// Icinga2Node creates a new Icinga 2 node.
//
// Each call to this function will spawn a dedicated Icinga 2 Docker container using the icinga/icinga2:master image.
// Each call to this function will spawn a dedicated Icinga 2 Docker container using the icinga/icinga2:edge image.
func (it *IT) Icinga2Node(name string) services.Icinga2 {
return services.Icinga2{Icinga2Base: it.getIcinga2().CreateIcinga2(name)}
}
Expand Down