chore(s2n-quic-qns): use updated docker compose (#2295)

aws · Aug 6, 2024 · 42ee277 · 42ee277
1 parent 445f73b
commit 42ee277
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/scripts/benchmark/run b/scripts/benchmark/run
@@ -14,7 +14,7 @@ function ensure_executable() {
   fi
 }
 
-ensure_executable "docker-compose"
+ensure_executable "docker compose"
 ensure_executable "tshark"
 ensure_executable "gnuplot"
 
@@ -64,7 +64,7 @@ DOWNLOAD_B=$(($DOWNLOAD_MB * 1000000)) \
 UPLOAD_B=$(($UPLOAD_MB * 1000000)) \
 DURATION="$DURATION" \
 SCENARIO="$SCENARIO" \
-docker-compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 sim client server
+docker compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 sim client server
 
 tshark -r "$LOG_DIR/$CLIENT_PCAP" -t u -qz io,stat,1,"SUM(ip.len)"ip.len\&\&ip.dst==193.167.0.100 | awk -F '[\\|\s]' '{ print $2 $3}' > "${TMP}/s2n-quic.nsv"
 # Find the time of the first real data transfer packet
@@ -88,7 +88,7 @@ if [ "$COMPARE_TO_MAIN" = true ] ; then
     UPLOAD_B=$(($UPLOAD_MB * 1000000)) \
     DURATION="$DURATION" \
     SCENARIO="$SCENARIO" \
-    docker-compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 sim client server-main
+    docker compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 sim client server-main
 
     tshark -r "$LOG_DIR/$CLIENT_PCAP" -t u -qz io,stat,1,"SUM(ip.len)"ip.len\&\&ip.dst==193.167.0.100 | awk -F '[\\|\s]' '{ print $2 $3}' > "${TMP}/s2n-quic-main.nsv"
     # Find the time of the first real data transfer packet
@@ -117,7 +117,7 @@ do
     LOG_DIR="$LOG_DIR" \
     SCENARIO="$SCENARIO" \
     DURATION="$DURATION" \
-    docker-compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 --exit-code-from iperf_client sim iperf_client iperf_server && break
+    docker compose --file quic/s2n-quic-qns/benchmark/docker-compose.yml up --abort-on-container-exit --timeout 1 --exit-code-from iperf_client sim iperf_client iperf_server && break
     ATTEMPTS=$((ATTEMPTS+1))
 done
 

diff --git a/scripts/interop/README.md b/scripts/interop/README.md
@@ -2,7 +2,7 @@
 
 ## Requirements
 
-* docker-compose
+* docker compose
 * tshark
 
 ## Pulling the latest images

diff --git a/scripts/interop/run b/scripts/interop/run
@@ -43,7 +43,7 @@ function ensure_executable() {
   fi
 }
 
-ensure_executable "docker-compose"
+ensure_executable "docker compose"
 ensure_executable "tshark"
 
 case "$(uname -s)" in