From 005e14d71696fea8d107c204c8c0b18df87ec798 Mon Sep 17 00:00:00 2001 From: Julian Brost Date: Wed, 3 Dec 2025 10:36:59 +0100 Subject: [PATCH] Icinga 2 snapshot containers now use the edge tag The Icinga 2 snapshot container images are no longer pushed as `icinga/icinga2:master` to Docker Hub but as `icinga/icinga2:edge` instead. https://github.com/Icinga/icinga2/pull/10505 https://icinga.com/blog/enhanced-icinga-2-container-images/ --- internal/services/icinga2/docker.go | 2 +- it.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/services/icinga2/docker.go b/internal/services/icinga2/docker.go index c472a71..8a4dff7 100644 --- a/internal/services/icinga2/docker.go +++ b/internal/services/icinga2/docker.go @@ -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) diff --git a/it.go b/it.go index 2d4c650..946fe9a 100644 --- a/it.go +++ b/it.go @@ -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") @@ -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)} }