database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Fix](docker) Fix regression test docker issues. (#18928)

Browse Source 
1. Fix not reset data after pg restarted.
2. 'docker-compose' to 'docker compose'.
This commit is contained in:
Qi Chen
2023-04-22 18:03:50 +08:00
committed by GitHub
parent 1ffd34f6f1
commit 1ff2ccc6c5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/thirdparties/run-thirdparties-docker.sh
View File

@ -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