Bring in second -T instance from #1251

getsentry · Feb 2, 2022 · 0fcefa7 · 0fcefa7
1 parent 290881b
commit 0fcefa7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/install/create-kafka-topics.sh b/install/create-kafka-topics.sh
@@ -2,7 +2,7 @@ echo "${_group}Creating additional Kafka topics ..."
 
 # NOTE: This step relies on `kafka` being available from the previous `snuba-api bootstrap` step
 # XXX(BYK): We cannot use auto.create.topics as Confluence and Apache hates it now (and makes it very hard to enable)
-EXISTING_KAFKA_TOPICS=$($dcr kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null)
+EXISTING_KAFKA_TOPICS=$($dcr -T kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null)
 NEEDED_KAFKA_TOPICS="ingest-attachments ingest-transactions ingest-events"
 for topic in $NEEDED_KAFKA_TOPICS; do
   if ! echo "$EXISTING_KAFKA_TOPICS" | grep -wq $topic; then

diff --git a/install/ensure-relay-credentials.sh b/install/ensure-relay-credentials.sh
@@ -17,7 +17,8 @@ else
   #    --overwrite) and fail because it is empty.
   #
   # 2. We need to use -T to avoid additional garbage output cluttering
-  #    credentials.json under Docker Compose 1.x and 2.2.3+.
+  #    credentials.json under Docker Compose 1.x and 2.2.3+. Note that the
+  #    long opt --no-tty doesn't exist in Docker Compose 1.
 
   creds="$dcr --no-deps -T relay credentials"
   $creds generate --stdout > "$RELAY_CREDENTIALS_JSON".tmp