diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index b196622..a3a28c9 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -13,8 +13,8 @@ steps: build: image: maven:3.9.9-eclipse-temurin-17 commands: - - env | sort - - mvn deploy --settings=.woodpecker/maven/settings.xml + - DOCKER_HOST=tls://$(env|grep DOCKERD_SERVICE_HOST|cut -d= -f2):2375 env | sort + - DOCKER_HOST=tls://$(env|grep DOCKERD_SERVICE_HOST|cut -d= -f2):2375 mvn deploy --settings=.woodpecker/maven/settings.xml environment: NEXUS_USERNAME: {from_secret: nexus_username} NEXUS_PASSWORD: {from_secret: nexus_password} diff --git a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java index ada9013..09442aa 100644 --- a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java +++ b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java @@ -57,8 +57,7 @@ public class KeycloakExtension implements BeforeAllCallback, ParameterResolver { if (System.getenv("CI") != null) { // use fixed port and hostname in ci container = new FixedHostPortGenericContainer<>(image) - .withFixedExposedPort(8080, 8080) - .withCreateContainerCmdModifier(c -> c.withName("keycloak")); + .withFixedExposedPort(8080, 8080); } container.withEnv("KEYCLOAK_ADMIN", "admin") .withEnv("KEYCLOAK_ADMIN_PASSWORD", "password") @@ -72,7 +71,7 @@ public class KeycloakExtension implements BeforeAllCallback, ParameterResolver { .withCopyFileToContainer(MountableFile.forHostPath(jar), "/opt/keycloak/providers/metrics.jar") .withLogConsumer(out -> System.out.print(out.getUtf8String())) .withStartupTimeout(Duration.parse(timeout)) - .waitingFor(Wait.forHttp("/health").forPort(8080)) + .waitingFor(Wait.forHttp("/health").forPort(8080).withStartupTimeout(Duration.ofMinutes(5))) .withCommand("start-dev"); try { container.start();