Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use /tmp for zookeeper.properties and startup script #7524

Merged
merged 4 commits into from
May 20, 2024
Merged

Use /tmp for zookeeper.properties and startup script #7524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3e4d5e
Use /tmp for zookeeper.properties and startup script
kahowell Sep 12, 2023
bf37403
Merge branch 'main' into use-tmp-for-kafka-writes
eddumelendez May 20, 2024
6a85280
Fix path to zookeeper.properties
eddumelendez May 20, 2024
1883aa5
Move testcontainers start script to tmp
eddumelendez May 20, 2024
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
10 changes: 5 additions & 5 deletions modules/kafka/src/main/java/org/testcontainers/containers/KafkaContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {

private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";

private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
private static final String STARTER_SCRIPT = "/tmp/testcontainers_start.sh";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it would be possible to allow for the path to be fully configurable from the outside instead of hard coding it to /tmp ?


// https://docs.confluent.io/platform/7.0.0/release-notes/index.html#ak-raft-kraft
private static final String MIN_KRAFT_TAG = "7.0.0";
Expand Down Expand Up @@ -208,10 +208,10 @@ protected String commandKraft() {
}

protected String commandZookeeper() {
String command = "echo 'clientPort=" + ZOOKEEPER_PORT + "' > zookeeper.properties\n";
command += "echo 'dataDir=/var/lib/zookeeper/data' >> zookeeper.properties\n";
command += "echo 'dataLogDir=/var/lib/zookeeper/log' >> zookeeper.properties\n";
command += "zookeeper-server-start zookeeper.properties &\n";
String command = "echo 'clientPort=" + ZOOKEEPER_PORT + "' > /tmp/zookeeper.properties\n";
command += "echo 'dataDir=/var/lib/zookeeper/data' >> /tmp/zookeeper.properties\n";
command += "echo 'dataLogDir=/var/lib/zookeeper/log' >> /tmp/zookeeper.properties\n";
command += "zookeeper-server-start /tmp/zookeeper.properties &\n";
return command;
}

Expand Down
2 changes: 1 addition & 1 deletion modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {

private static final String DEFAULT_INTERNAL_TOPIC_RF = "1";

private static final String STARTER_SCRIPT = "/testcontainers_start.sh";
private static final String STARTER_SCRIPT = "/tmp/testcontainers_start.sh";

private static final String DEFAULT_CLUSTER_ID = "4L6g3nShT-eMCtK--X86sw";

Expand Down
Loading