Fix script to run on ubuntu 24.04

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
containerd · Jun 25, 2024 · e13a32d · e13a32d
1 parent 66247e6
commit e13a32d
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/script/benchmark/test.sh b/script/benchmark/test.sh
@@ -70,8 +70,8 @@ cat <<EOF > "${TMP_CONTEXT}/Dockerfile"
 FROM ${BENCHMARKING_BASE_IMAGE_NAME}
 
 RUN apt-get update -y && \
-    apt-get install -y python2 jq wget && \
-    ln -s /usr/bin/python2 /usr/bin/python && \
+    apt-get install -y python3 jq wget && \
+    ln -s /usr/bin/python3 /usr/bin/python && \
     mkdir -p /tmp/crane && \
     wget -O - https://github.com/google/go-containerregistry/releases/download/v0.19.1/go-containerregistry_Linux_x86_64.tar.gz | tar -C /tmp/crane/ -zxf - && \
     mv /tmp/crane/crane /usr/local/bin/
@@ -133,9 +133,9 @@ echo "Logging to >>> ${LOG_FILE} (will finally be stored under ${OUTPUTDIR})"
 echo "Benchmarking..."
 FAIL=
 if ! ( cd "${CONTEXT}" && \
-           docker-compose -f "${DOCKER_COMPOSE_YAML}" build ${DOCKER_BUILD_ARGS:-} \
+           docker compose -f "${DOCKER_COMPOSE_YAML}" build ${DOCKER_BUILD_ARGS:-} \
                           "${BENCHMARKING_NODE}" && \
-           docker-compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate && \
+           docker compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate && \
            docker exec \
 		  -e BENCHMARK_RUNTIME_MODE -e BENCHMARK_SAMPLES_NUM -e BENCHMARK_PROFILE \
                   -i "${BENCHMARKING_CONTAINER}" \
@@ -165,7 +165,7 @@ if [ "${FAIL}" != "true" ] ; then
 fi
 
 echo "Cleaning up environment..."
-docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v
+docker compose -f "${DOCKER_COMPOSE_YAML}" down -v
 if [ "${FAIL}" == "true" ] ; then
     exit 1
 fi

diff --git a/script/cri-containerd/test-stargz.sh b/script/cri-containerd/test-stargz.sh
@@ -39,7 +39,7 @@ LOG_FILE=$(mktemp)
 MIRROR_TMP=$(mktemp -d)
 function cleanup {
     ORG_EXIT_CODE="${1}"
-    docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v || true
+    docker compose -f "${DOCKER_COMPOSE_YAML}" down -v || true
     rm -rf "${TMP_CONTEXT}" || true
     rm "${DOCKER_COMPOSE_YAML}" || true
     rm "${CONTAINERD_CONFIG}" || true
@@ -90,7 +90,7 @@ volumes:
   critest-prepare-containerd-data:
   critest-prepare-containerd-stargz-grpc-data:
 EOF
-docker-compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate
+docker compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate
 
 CONNECTED=
 for i in $(seq 100) ; do

diff --git a/script/cri-o/test-stargz.sh b/script/cri-o/test-stargz.sh
@@ -38,7 +38,7 @@ LOG_FILE=$(mktemp)
 MIRROR_TMP=$(mktemp -d)
 function cleanup {
     ORG_EXIT_CODE="${1}"
-    docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v || true
+    docker compose -f "${DOCKER_COMPOSE_YAML}" down -v || true
     rm -rf "${TMP_CONTEXT}" || true
     rm "${DOCKER_COMPOSE_YAML}" || true
     rm "${CRIO_CONFIG}" || true
@@ -109,7 +109,7 @@ volumes:
   critest-prepare-containerd-data:
   critest-prepare-containerd-stargz-grpc-data:
 EOF
-docker-compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate
+docker compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate
 
 retry docker exec "${PREPARE_NODE_NAME}" curl -k --head "http://${REGISTRY_HOST}:5000/v2/"
 

diff --git a/script/criauth/test.sh b/script/criauth/test.sh
@@ -103,11 +103,11 @@ EOF
 cp "${REPO}/script/criauth/mirror.sh" "${MIRROR_TMP}/mirror.sh"
 if ! ( cd "${CONTEXT}" && \
            docker network create "${REGISTRY_NETWORK}" && \
-           docker-compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate && \
+           docker compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate && \
            docker exec "${PREPARE_NODE_NAME}" /bin/bash /tools/mirror.sh \
                   "${TESTIMAGE_ORIGIN}" "${TESTIMAGE}" ) ; then
     echo "Failed to prepare private registry"
-    docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v
+    docker compose -f "${DOCKER_COMPOSE_YAML}" down -v
     docker network rm "${REGISTRY_NETWORK}"
     exit 1
 fi
@@ -126,7 +126,7 @@ if ! ( "${CONTEXT}"/run-kind.sh "${KIND_CLUSTER_NAME}" \
                      "${KIND_KUBECONFIG}" "${TESTIMAGE}" ) ; then
     FAIL=true
 fi
-docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v
+docker compose -f "${DOCKER_COMPOSE_YAML}" down -v
 kind delete cluster --name "${KIND_CLUSTER_NAME}"
 docker network rm "${REGISTRY_NETWORK}"
 

diff --git a/script/integration/test.sh b/script/integration/test.sh
@@ -153,12 +153,12 @@ EOF
 echo "Testing..."
 FAIL=
 if ! ( cd "${CONTEXT}" && \
-           docker-compose -f "${DOCKER_COMPOSE_YAML}" build ${DOCKER_BUILD_ARGS:-} \
+           docker compose -f "${DOCKER_COMPOSE_YAML}" build ${DOCKER_BUILD_ARGS:-} \
                           "${CONTAINERD_NODE}" && \
-           docker-compose -f "${DOCKER_COMPOSE_YAML}" up --abort-on-container-exit ) ; then
+           docker compose -f "${DOCKER_COMPOSE_YAML}" up --abort-on-container-exit ) ; then
     FAIL=true
 fi
-docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v
+docker compose -f "${DOCKER_COMPOSE_YAML}" down -v
 if [ "${FAIL}" == "true" ] ; then
     exit 1
 fi

diff --git a/script/k3s/test.sh b/script/k3s/test.sh
@@ -103,11 +103,11 @@ EOF
 cp "${REPO}/script/k3s/mirror.sh" "${MIRROR_TMP}/mirror.sh"
 if ! ( cd "${CONTEXT}" && \
            docker network create "${REGISTRY_NETWORK}" && \
-           docker-compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate && \
+           docker compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate && \
            docker exec "${PREPARE_NODE_NAME}" /bin/bash /tools/mirror.sh \
                   "${TESTIMAGE_ORIGIN}" "${TESTIMAGE}" ) ; then
     echo "Failed to prepare private registry"
-    docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v
+    docker compose -f "${DOCKER_COMPOSE_YAML}" down -v
     docker network rm "${REGISTRY_NETWORK}"
     exit 1
 fi
@@ -127,7 +127,7 @@ if ! ( "${CONTEXT}"/run-k3s.sh "${K3S_CLUSTER_NAME}" \
                      "${K3S_KUBECONFIG}" "${TESTIMAGE}" ) ; then
     FAIL=true
 fi
-docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v
+docker compose -f "${DOCKER_COMPOSE_YAML}" down -v
 k3d cluster delete "${K3S_CLUSTER_NAME}"
 docker network rm "${REGISTRY_NETWORK}"
 

diff --git a/script/kind/test.sh b/script/kind/test.sh
@@ -103,11 +103,11 @@ EOF
 cp "${REPO}/script/kind/mirror.sh" "${MIRROR_TMP}/mirror.sh"
 if ! ( cd "${CONTEXT}" && \
            docker network create "${REGISTRY_NETWORK}" && \
-           docker-compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate && \
+           docker compose -f "${DOCKER_COMPOSE_YAML}" up -d --force-recreate && \
            docker exec "${PREPARE_NODE_NAME}" /bin/bash /tools/mirror.sh \
                   "${TESTIMAGE_ORIGIN}" "${TESTIMAGE}" ) ; then
     echo "Failed to prepare private registry"
-    docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v
+    docker compose -f "${DOCKER_COMPOSE_YAML}" down -v
     docker network rm "${REGISTRY_NETWORK}"
     exit 1
 fi
@@ -127,7 +127,7 @@ if ! ( "${CONTEXT}"/run-kind.sh "${KIND_CLUSTER_NAME}" \
                      "${KIND_KUBECONFIG}" "${TESTIMAGE}" ) ; then
     FAIL=true
 fi
-docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v
+docker compose -f "${DOCKER_COMPOSE_YAML}" down -v
 kind delete cluster --name "${KIND_CLUSTER_NAME}"
 docker network rm "${REGISTRY_NETWORK}"
 

diff --git a/script/optimize/test.sh b/script/optimize/test.sh
@@ -150,11 +150,11 @@ volumes:
 EOF
     local FAIL=
     if ! ( cd "${CONTEXT}" && \
-               docker-compose -f "${DOCKER_COMPOSE_YAML}" build ${DOCKER_BUILD_ARGS:-} testenv_opt && \
-               docker-compose -f "${DOCKER_COMPOSE_YAML}" up --abort-on-container-exit ) ; then
+               docker compose -f "${DOCKER_COMPOSE_YAML}" build ${DOCKER_BUILD_ARGS:-} testenv_opt && \
+               docker compose -f "${DOCKER_COMPOSE_YAML}" up --abort-on-container-exit ) ; then
         FAIL=true
     fi
-    docker-compose -f "${DOCKER_COMPOSE_YAML}" down -v
+    docker compose -f "${DOCKER_COMPOSE_YAML}" down -v
     if [ "${FAIL}" == "true" ] ; then
         exit 1
     fi

diff --git a/script/podman/config/test-podman-rootless.sh b/script/podman/config/test-podman-rootless.sh
@@ -17,7 +17,7 @@
 set -eux -o pipefail
 if [[ "$(id -u)" = "0" ]]; then
 	# Switch to the rootless user via SSH; This is the same approach as done in nerdctl CI
-	systemctl start sshd
+	systemctl start ssh
 	exec ssh -o StrictHostKeyChecking=no rootless@localhost "$0" "$@"
 else
 	systemctl --user start podman-rootless-stargz-store