This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 42c6257820b branch-3.0: [fix](docker) solve kerberos docker conflict
#47260 (#47272)
42c6257820b is described below
commit 42c6257820bb18a2675b96c0571b8ec991e92339
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 24 10:23:49 2025 +0800
branch-3.0: [fix](docker) solve kerberos docker conflict #47260 (#47272)
Cherry-picked from #47260
Co-authored-by: zgxme <zhenggaoxi...@selectdb.com>
---
docker/thirdparties/run-thirdparties-docker.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/docker/thirdparties/run-thirdparties-docker.sh
b/docker/thirdparties/run-thirdparties-docker.sh
index 755f780e7f4..b35ae64a8b2 100755
--- a/docker/thirdparties/run-thirdparties-docker.sh
+++ b/docker/thirdparties/run-thirdparties-docker.sh
@@ -614,7 +614,6 @@ start_kerberos() {
sudo chmod a+w /etc/hosts
sudo sed -i "1i${IP_HOST} hadoop-master" /etc/hosts
sudo sed -i "1i${IP_HOST} hadoop-master-2" /etc/hosts
- sudo cp "${ROOT}"/docker-compose/kerberos/kerberos.yaml.tpl
"${ROOT}"/docker-compose/kerberos/kerberos.yaml
sudo docker compose -f "${ROOT}"/docker-compose/kerberos/kerberos.yaml down
sudo rm -rf "${ROOT}"/docker-compose/kerberos/data
if [[ "${STOP}" -ne 1 ]]; then
@@ -622,7 +621,7 @@ start_kerberos() {
rm -rf "${ROOT}"/docker-compose/kerberos/two-kerberos-hives/*.keytab
rm -rf "${ROOT}"/docker-compose/kerberos/two-kerberos-hives/*.jks
rm -rf "${ROOT}"/docker-compose/kerberos/two-kerberos-hives/*.conf
- sudo docker compose -f "${ROOT}"/docker-compose/kerberos/kerberos.yaml
up -d --wait
+ sudo docker compose -f "${ROOT}"/docker-compose/kerberos/kerberos.yaml
up --remove-orphans --wait -d
sudo rm -f /keytabs
sudo ln -s "${ROOT}"/docker-compose/kerberos/two-kerberos-hives
/keytabs
sudo cp "${ROOT}"/docker-compose/kerberos/common/conf/doris-krb5.conf
/keytabs/krb5.conf
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
