chore: Update Redpanda v23.3.9

- Fix build for Podman - Update Redpanda container
citrusframework · Mar 26, 2024 · e7e35fe · e7e35fe
1 parent d8fb096
commit e7e35fe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/...estcontainers/src/main/java/org/citrusframework/yaks/testcontainers/RedpandaSettings.java b/...estcontainers/src/main/java/org/citrusframework/yaks/testcontainers/RedpandaSettings.java
@@ -26,15 +26,15 @@ public class RedpandaSettings {
 
     private static final String REDPANDA_VERSION_PROPERTY = REDPANDA_PROPERTY_PREFIX + "version";
     private static final String REDPANDA_VERSION_ENV = REDPANDA_ENV_PREFIX + "REDPANDA_VERSION";
-    private static final String REDPANDA_VERSION_DEFAULT = "v23.1.19";
+    private static final String REDPANDA_VERSION_DEFAULT = "v23.3.9";
 
     private static final String REDPANDA_SERVICE_NAME_PROPERTY = REDPANDA_PROPERTY_PREFIX + "service.name";
     private static final String REDPANDA_SERVICE_NAME_ENV = REDPANDA_ENV_PREFIX + "REDPANDA_SERVICE_NAME";
     private static final String REDPANDA_SERVICE_NAME_DEFAULT = "yaks-redpanda";
 
     private static final String REDPANDA_IMAGE_NAME_PROPERTY = REDPANDA_PROPERTY_PREFIX + "image.name";
     private static final String REDPANDA_IMAGE_NAME_ENV = REDPANDA_ENV_PREFIX + "REDPANDA_IMAGE_NAME";
-    private static final String REDPANDA_IMAGE_NAME_DEFAULT = "docker.redpanda.com/vectorized/redpanda";
+    private static final String REDPANDA_IMAGE_NAME_DEFAULT = "redpandadata/redpanda";
 
     private static final String STARTUP_TIMEOUT_PROPERTY = REDPANDA_PROPERTY_PREFIX + "startup.timeout";
     private static final String STARTUP_TIMEOUT_ENV = REDPANDA_ENV_PREFIX + "STARTUP_TIMEOUT";

diff --git a/...s-testcontainers/src/main/java/org/citrusframework/yaks/testcontainers/RedpandaSteps.java b/...s-testcontainers/src/main/java/org/citrusframework/yaks/testcontainers/RedpandaSteps.java
@@ -100,8 +100,15 @@ public void startRedpanda() {
                 .withNetwork(Network.newNetwork())
                 .withNetworkAliases(serviceName)
                 .withEnv(env)
-                .waitingFor(Wait.forLogMessage(".*Started Kafka API server.*", 1)
-                        .withStartupTimeout(Duration.of(startupTimeout, SECONDS)));
+                .waitingFor(Wait.forLogMessage(".*Successfully started Redpanda!.*", 1)
+                        .withStartupTimeout(Duration.of(startupTimeout, SECONDS)))
+                // TODO: Remove once Redpanda container works with Podman
+                . withCreateContainerCmdModifier(cmd -> {
+                    cmd.withEntrypoint();
+                    cmd.withEntrypoint("/entrypoint-tc.sh");
+                    cmd.withUser("root:root");
+                })
+                .withCommand("redpanda", "start", "--mode=dev-container", "--smp=1", "--memory=1G");
 
         redpandaContainer.start();
 

diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
diff --git a/script/docker-build.sh b/script/docker-build.sh
@@ -32,4 +32,4 @@ export CGO_ENABLED=0
 
 mkdir -p build/_output/bin
 eval go build "$build_flags" -o build/_output/bin/yaks ./cmd/manager/*.go
-docker build -t $image -f build/Dockerfile .
+docker build --load -t $image -f build/Dockerfile .