migrate to compose v2

aklivity · Jul 19, 2024 · 52ad7c6 · 52ad7c6
1 parent 5c0355a
commit 52ad7c6
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 45 deletions.
diff --git a/asyncapi.http.kafka.proxy/docker/compose/docker-compose.yaml b/asyncapi.http.kafka.proxy/docker/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   zilla:
     image: ghcr.io/aklivity/zilla:${ZILLA_VERSION}
@@ -8,6 +7,7 @@ services:
     ports:
       - 7114:7114
     environment:
+      KAFKA_BOOTSTRAP_SERVER: ${KAFKA_BOOTSTRAP_SERVER}
       ZILLA_INCUBATOR_ENABLED: "true"
     volumes:
       - ../../zilla.yaml:/etc/zilla/zilla.yaml

diff --git a/asyncapi.http.kafka.proxy/docker/compose/setup.sh b/asyncapi.http.kafka.proxy/docker/compose/setup.sh
@@ -9,9 +9,9 @@ export KAFKA_PORT="${KAFKA_PORT:-9092}"
 INIT_KAFKA="${INIT_KAFKA:-true}"
 
 # Start or restart Zilla
-if [[ -z $(docker-compose -p $NAMESPACE ps -q zilla) ]]; then
+if [[ -z $(docker compose -p $NAMESPACE ps -q zilla) ]]; then
   echo "==== Running the $NAMESPACE example with $KAFKA_BROKER($KAFKA_BOOTSTRAP_SERVER) ===="
-  docker-compose -p $NAMESPACE up -d
+  docker compose -p $NAMESPACE up -d
 
   # Create topics in Kafka
   if [[ $INIT_KAFKA == true ]]; then
@@ -24,5 +24,5 @@ if [[ -z $(docker-compose -p $NAMESPACE ps -q zilla) ]]; then
   fi
 
 else
-  docker-compose -p $NAMESPACE restart --no-deps zilla
+  docker compose -p $NAMESPACE up --force-recreate --no-deps zilla
 fi
diff --git a/asyncapi.http.kafka.proxy/docker/compose/teardown.sh b/asyncapi.http.kafka.proxy/docker/compose/teardown.sh
@@ -2,4 +2,4 @@
 set -e
 
 NAMESPACE="${NAMESPACE:-zilla-asyncapi-http-kafka-proxy}"
-docker-compose -p $NAMESPACE down --remove-orphans
+docker compose -p $NAMESPACE down --remove-orphans
diff --git a/asyncapi.mqtt.kafka.proxy/docker/compose/docker-compose.yaml b/asyncapi.mqtt.kafka.proxy/docker/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   zilla:
     image: ghcr.io/aklivity/zilla:${ZILLA_VERSION}

diff --git a/asyncapi.mqtt.kafka.proxy/docker/compose/setup.sh b/asyncapi.mqtt.kafka.proxy/docker/compose/setup.sh
@@ -8,9 +8,9 @@ export KAFKA_BOOTSTRAP_SERVER="${KAFKA_BOOTSTRAP_SERVER:-host.docker.internal:90
 INIT_KAFKA="${INIT_KAFKA:-true}"
 
 # Start or restart Zilla
-if [[ -z $(docker-compose -p $NAMESPACE ps -q zilla) ]]; then
+if [[ -z $(docker compose -p $NAMESPACE ps -q zilla) ]]; then
   echo "==== Running the $NAMESPACE example with $KAFKA_BROKER($KAFKA_BOOTSTRAP_SERVER) ===="
-  docker-compose -p $NAMESPACE up -d
+  docker compose -p $NAMESPACE up -d
 
   # Create the mqtt topics in Kafka
   if [[ $INIT_KAFKA == true ]]; then
@@ -24,5 +24,5 @@ if [[ -z $(docker-compose -p $NAMESPACE ps -q zilla) ]]; then
   fi
 
 else
-  docker-compose -p $NAMESPACE restart --no-deps zilla
+  docker compose -p $NAMESPACE up --force-recreate --no-deps zilla
 fi
diff --git a/asyncapi.mqtt.kafka.proxy/docker/compose/teardown.sh b/asyncapi.mqtt.kafka.proxy/docker/compose/teardown.sh
@@ -2,4 +2,4 @@
 set -e
 
 NAMESPACE="${NAMESPACE:-zilla-asyncapi-mqtt-kafka-proxy}"
-docker-compose -p $NAMESPACE down --remove-orphans
+docker compose -p $NAMESPACE down --remove-orphans
diff --git a/asyncapi.sse.kafka.proxy/docker/compose/docker-compose.yaml b/asyncapi.sse.kafka.proxy/docker/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   zilla:
     image: ghcr.io/aklivity/zilla:${ZILLA_VERSION}
@@ -8,6 +7,7 @@ services:
     ports:
       - 7114:7114
     environment:
+      KAFKA_BOOTSTRAP_SERVER: ${KAFKA_BOOTSTRAP_SERVER}
       ZILLA_INCUBATOR_ENABLED: "true"
     volumes:
       - ../../zilla.yaml:/etc/zilla/zilla.yaml

diff --git a/asyncapi.sse.kafka.proxy/docker/compose/setup.sh b/asyncapi.sse.kafka.proxy/docker/compose/setup.sh
@@ -9,9 +9,9 @@ export KAFKA_PORT="${KAFKA_PORT:-9092}"
 INIT_KAFKA="${INIT_KAFKA:-true}"
 
 # Start or restart Zilla
-if [[ -z $(docker-compose -p $NAMESPACE ps -q zilla) ]]; then
+if [[ -z $(docker compose -p $NAMESPACE ps -q zilla) ]]; then
   echo "==== Running the $NAMESPACE example with $KAFKA_BROKER($KAFKA_BOOTSTRAP_SERVER) ===="
-  docker-compose -p $NAMESPACE up -d
+  docker compose -p $NAMESPACE up -d
 
   # Create topics in Kafka
   if [[ $INIT_KAFKA == true ]]; then
@@ -22,5 +22,5 @@ if [[ -z $(docker-compose -p $NAMESPACE ps -q zilla) ]]; then
   fi
 
 else
-  docker-compose -p $NAMESPACE restart --no-deps zilla
+  docker compose -p $NAMESPACE up --force-recreate --no-deps zilla
 fi
diff --git a/asyncapi.sse.kafka.proxy/docker/compose/teardown.sh b/asyncapi.sse.kafka.proxy/docker/compose/teardown.sh
@@ -2,4 +2,4 @@
 set -e
 
 NAMESPACE="${NAMESPACE:-zilla-asyncapi-sse-kafka-proxy}"
-docker-compose -p $NAMESPACE down --remove-orphans
+docker compose -p $NAMESPACE down --remove-orphans
diff --git a/kafka.broker/docker/compose/docker-compose.yaml b/kafka.broker/docker/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   kafka:
     image: bitnami/kafka:3.5

diff --git a/kafka.broker/docker/compose/setup.sh b/kafka.broker/docker/compose/setup.sh
@@ -3,8 +3,8 @@ set -e
 
 NAMESPACE="${NAMESPACE:-zilla-kafka-broker}"
 
-if [[ -z $(docker-compose -p $NAMESPACE ps -q kafka) || -z $(docker-compose -p $NAMESPACE ps -q kafka-ui) ]]; then
-  docker-compose -p $NAMESPACE up -d
-elif [[ -n $(docker-compose -p $NAMESPACE ps -q kafka-ui) ]]; then
-  docker-compose -p $NAMESPACE restart kafka-ui
+if [[ -z $(docker compose -p $NAMESPACE ps -q kafka) || -z $(docker compose -p $NAMESPACE ps -q kafka-ui) ]]; then
+  docker compose -p $NAMESPACE up -d
+elif [[ -n $(docker compose -p $NAMESPACE ps -q kafka-ui) ]]; then
+  docker compose -p $NAMESPACE restart kafka-ui
 fi
diff --git a/kafka.broker/docker/compose/teardown.sh b/kafka.broker/docker/compose/teardown.sh
@@ -2,4 +2,4 @@
 set -e
 
 NAMESPACE="${NAMESPACE:-zilla-kafka-broker}"
-docker-compose -p $NAMESPACE down --remove-orphans
+docker compose -p $NAMESPACE down --remove-orphans
diff --git a/mqtt.kafka.broker/docker/compose/docker-compose.yaml b/mqtt.kafka.broker/docker/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   zilla:
     image: ghcr.io/aklivity/zilla:${ZILLA_VERSION}

diff --git a/mqtt.kafka.broker/docker/compose/setup.sh b/mqtt.kafka.broker/docker/compose/setup.sh
@@ -8,9 +8,9 @@ export KAFKA_BOOTSTRAP_SERVER="${KAFKA_BOOTSTRAP_SERVER:-host.docker.internal:90
 INIT_KAFKA="${INIT_KAFKA:-true}"
 
 # Start or restart Zilla
-if [[ -z $(docker-compose -p $NAMESPACE ps -q zilla) ]]; then
+if [[ -z $(docker compose -p $NAMESPACE ps -q zilla) ]]; then
   echo "==== Running the $NAMESPACE example with $KAFKA_BROKER($KAFKA_BOOTSTRAP_SERVER) ===="
-  docker-compose -p $NAMESPACE up -d
+  docker compose -p $NAMESPACE up -d
 
   if [[ $INIT_KAFKA == true ]]; then
     # Create the mqtt topics in Kafka
@@ -24,5 +24,5 @@ if [[ -z $(docker-compose -p $NAMESPACE ps -q zilla) ]]; then
   fi
 
 else
-  docker-compose -p $NAMESPACE restart --no-deps zilla
+  docker compose -p $NAMESPACE up --force-recreate --no-deps zilla
 fi
diff --git a/mqtt.kafka.broker/docker/compose/teardown.sh b/mqtt.kafka.broker/docker/compose/teardown.sh
@@ -2,4 +2,4 @@
 set -e
 
 NAMESPACE="${NAMESPACE:-zilla-mqtt-kafka-broker}"
-docker-compose -p $NAMESPACE down --remove-orphans
+docker compose -p $NAMESPACE down --remove-orphans
diff --git a/openapi.proxy/docker/compose/docker-compose.yaml b/openapi.proxy/docker/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   zilla:
     image: ghcr.io/aklivity/zilla:${ZILLA_VERSION}

diff --git a/openapi.proxy/docker/compose/setup.sh b/openapi.proxy/docker/compose/setup.sh
@@ -5,8 +5,8 @@ NAMESPACE="${NAMESPACE:-zilla-openapi-proxy}"
 export ZILLA_VERSION="${ZILLA_VERSION:-latest}"
 
 # Start or restart Zilla
-if [[ -z $(docker-compose -p $NAMESPACE ps -q zilla) ]]; then
-  docker-compose -p $NAMESPACE up -d
+if [[ -z $(docker compose -p $NAMESPACE ps -q zilla) ]]; then
+  docker compose -p $NAMESPACE up -d
 else
-  docker-compose -p $NAMESPACE restart --no-deps zilla
+  docker compose -p $NAMESPACE up --force-recreate --no-deps zilla
 fi
diff --git a/openapi.proxy/docker/compose/teardown.sh b/openapi.proxy/docker/compose/teardown.sh
@@ -2,4 +2,4 @@
 set -e
 
 NAMESPACE="${NAMESPACE:-zilla-openapi-proxy}"
-docker-compose -p $NAMESPACE down --remove-orphans
+docker compose -p $NAMESPACE down --remove-orphans
diff --git a/quickstart/docker/compose/docker-compose.yaml b/quickstart/docker/compose/docker-compose.yaml
@@ -1,7 +1,4 @@
-version: '3'
 services:
-
-
   zilla:
     image: ghcr.io/aklivity/zilla:${ZILLA_VERSION}
     container_name: zilla

diff --git a/quickstart/docker/compose/setup.sh b/quickstart/docker/compose/setup.sh
@@ -8,9 +8,9 @@ export KAFKA_BOOTSTRAP_SERVER="${KAFKA_BOOTSTRAP_SERVER:-host.docker.internal:90
 INIT_KAFKA="${INIT_KAFKA:-true}"
 
 # Start or restart Zilla
-if [[ -z $(docker-compose -p "$NAMESPACE" ps -q zilla) ]]; then
+if [[ -z $(docker compose -p "$NAMESPACE" ps -q zilla) ]]; then
   echo "==== Running the $NAMESPACE example with $KAFKA_BROKER($KAFKA_BOOTSTRAP_SERVER) ===="
-  docker-compose -p $NAMESPACE up -d
+  docker compose -p $NAMESPACE up -d
 
   if [[ $INIT_KAFKA == true ]]; then
     docker run --rm bitnami/kafka bash -c "
@@ -25,5 +25,5 @@ if [[ -z $(docker-compose -p "$NAMESPACE" ps -q zilla) ]]; then
   fi
 
 else
-  docker-compose -p $NAMESPACE restart --no-deps zilla
+  docker compose -p $NAMESPACE up --force-recreate --no-deps zilla
 fi
diff --git a/quickstart/docker/compose/teardown.sh b/quickstart/docker/compose/teardown.sh
@@ -2,4 +2,4 @@
 set -e
 
 NAMESPACE="${NAMESPACE:-zilla-quickstart}"
-docker-compose -p $NAMESPACE down --remove-orphans
+docker compose -p $NAMESPACE down --remove-orphans
diff --git a/redpanda.broker/docker/compose/docker-compose.yaml b/redpanda.broker/docker/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
 
   redpanda:

diff --git a/redpanda.broker/docker/compose/setup.sh b/redpanda.broker/docker/compose/setup.sh
@@ -3,10 +3,10 @@ set -e
 
 NAMESPACE="${NAMESPACE:-zilla-redpanda-broker}"
 
-if [[ -z $(docker-compose -p $NAMESPACE ps -q redpanda) || -z $(docker-compose -p $NAMESPACE ps -q console) ]]; then
-  docker-compose -p $NAMESPACE up -d
+if [[ -z $(docker compose -p $NAMESPACE ps -q redpanda) || -z $(docker compose -p $NAMESPACE ps -q console) ]]; then
+  docker compose -p $NAMESPACE up -d
 fi
 
-if [[ -n $(docker-compose -p $NAMESPACE ps -q console) ]]; then
-  docker-compose -p $NAMESPACE restart console
+if [[ -n $(docker compose -p $NAMESPACE ps -q console) ]]; then
+  docker compose -p $NAMESPACE restart console
 fi
diff --git a/redpanda.broker/docker/compose/teardown.sh b/redpanda.broker/docker/compose/teardown.sh
@@ -2,4 +2,4 @@
 set -e
 
 NAMESPACE="${NAMESPACE:-zilla-redpanda-broker}"
-docker-compose -p $NAMESPACE down --remove-orphans
+docker compose -p $NAMESPACE down --remove-orphans
diff --git a/startup.sh b/startup.sh
@@ -160,7 +160,7 @@ if [[ $USE_HELM == false && -d "$WORKDIR/$EXAMPLE_FOLDER/$COMPOSE_FOLDER" ]]; th
         echo "Docker is required to run this setup."
         exit
     fi
-    if ! [[ -x "$(command -v docker-compose)" ]]; then
+    if ! [[ -x "$(command -v docker compose)" ]]; then
         echo "Docker Compose is required to run this setup."
         exit
     fi