Revert "Add CI compose version 1.29.2 / 2.0.1 / 2.2.3 (#1251)" (#1272)

This reverts commit 3abbb3e8bd3a4d1d2ecbdb0f4fb255507c55aca0.
This commit is contained in:
Chad Whitacre 2022-01-24 16:36:14 -05:00 committed by GitHub
parent 3abbb3e8bd
commit da8f4903e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions

View File

@ -32,12 +32,8 @@ jobs:
include:
- compose_version: '1.28.0'
compose_path: '/usr/local/bin'
- compose_version: '1.29.2'
compose_path: '/usr/local/bin'
- compose_version: 'v2.0.1'
compose_path: '/usr/local/lib/docker/cli-plugins'
- compose_version: 'v2.2.3'
compose_path: '/usr/local/lib/docker/cli-plugins'
steps:
- name: Checkout
uses: actions/checkout@v2

View File

@ -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 --no-TTY kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null)
EXISTING_KAFKA_TOPICS=$($dcr 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

View File

@ -14,7 +14,7 @@ if [[ ! -f "$RELAY_CREDENTIALS_JSON" ]]; then
# creating an empty credentials file before relay runs.
$dcr \
--no-deps --no-TTY \
--no-deps \
--volume "$(pwd)/$RELAY_CONFIG_YML:/tmp/config.yml" \
relay --config /tmp credentials generate --stdout \
> "$RELAY_CREDENTIALS_JSON"