Skip to content

Commit 0fcefa7

Browse files
committed
Bring in second -T instance from #1251
1 parent 290881b commit 0fcefa7

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

install/create-kafka-topics.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ echo "${_group}Creating additional Kafka topics ..."
22

33
# NOTE: This step relies on `kafka` being available from the previous `snuba-api bootstrap` step
44
# XXX(BYK): We cannot use auto.create.topics as Confluence and Apache hates it now (and makes it very hard to enable)
5-
EXISTING_KAFKA_TOPICS=$($dcr kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null)
5+
EXISTING_KAFKA_TOPICS=$($dcr -T kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null)
66
NEEDED_KAFKA_TOPICS="ingest-attachments ingest-transactions ingest-events"
77
for topic in $NEEDED_KAFKA_TOPICS; do
88
if ! echo "$EXISTING_KAFKA_TOPICS" | grep -wq $topic; then

install/ensure-relay-credentials.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ else
1717
# --overwrite) and fail because it is empty.
1818
#
1919
# 2. We need to use -T to avoid additional garbage output cluttering
20-
# credentials.json under Docker Compose 1.x and 2.2.3+.
20+
# credentials.json under Docker Compose 1.x and 2.2.3+. Note that the
21+
# long opt --no-tty doesn't exist in Docker Compose 1.
2122

2223
creds="$dcr --no-deps -T relay credentials"
2324
$creds generate --stdout > "$RELAY_CREDENTIALS_JSON".tmp

0 commit comments

Comments
 (0)