From 1ff2ccc6c505318e708e09dc8d0562a61ffe1bf4 Mon Sep 17 00:00:00 2001 From: Qi Chen Date: Sat, 22 Apr 2023 18:03:50 +0800 Subject: [PATCH] [Fix](docker) Fix regression test docker issues. (#18928) 1. Fix not reset data after pg restarted. 2. 'docker-compose' to 'docker compose'. --- docker/thirdparties/run-thirdparties-docker.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/thirdparties/run-thirdparties-docker.sh b/docker/thirdparties/run-thirdparties-docker.sh index ac457cdbfe..ea6f903449 100755 --- a/docker/thirdparties/run-thirdparties-docker.sh +++ b/docker/thirdparties/run-thirdparties-docker.sh @@ -190,7 +190,7 @@ if [[ "${RUN_PG}" -eq 1 ]]; then sudo docker compose -f "${ROOT}"/docker-compose/postgresql/postgresql-14.yaml --env-file "${ROOT}"/docker-compose/postgresql/postgresql-14.env down if [[ "${STOP}" -ne 1 ]]; then sudo mkdir -p "${ROOT}"/docker-compose/postgresql/data/data - sudo rm "${ROOT}"/docker-compose/postgresql/data/data/* -rf + sudo rm "${ROOT}"/docker-compose/postgresql/data/* -rf sudo docker compose -f "${ROOT}"/docker-compose/postgresql/postgresql-14.yaml --env-file "${ROOT}"/docker-compose/postgresql/postgresql-14.env up -d fi fi @@ -241,10 +241,10 @@ if [[ "${RUN_HIVE}" -eq 1 ]]; then sed -i "s/doris--/${CONTAINER_UID}/g" "${ROOT}"/docker-compose/hive/hive-2x.yaml sed -i "s/doris--/${CONTAINER_UID}/g" "${ROOT}"/docker-compose/hive/hadoop-hive.env.tpl sudo bash "${ROOT}"/docker-compose/hive/gen_env.sh - sudo docker-compose -f "${ROOT}"/docker-compose/hive/hive-2x.yaml --env-file "${ROOT}"/docker-compose/hive/hadoop-hive.env down + sudo docker compose -f "${ROOT}"/docker-compose/hive/hive-2x.yaml --env-file "${ROOT}"/docker-compose/hive/hadoop-hive.env down sudo sed -i '/${CONTAINER_UID}namenode/d' /etc/hosts if [[ "${STOP}" -ne 1 ]]; then - sudo docker-compose -f "${ROOT}"/docker-compose/hive/hive-2x.yaml --env-file "${ROOT}"/docker-compose/hive/hadoop-hive.env up --build --remove-orphans -d + sudo docker compose -f "${ROOT}"/docker-compose/hive/hive-2x.yaml --env-file "${ROOT}"/docker-compose/hive/hadoop-hive.env up --build --remove-orphans -d sudo echo "127.0.0.1 ${CONTAINER_UID}namenode" >> /etc/hosts fi fi