This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 117cb96b0a8 [fix](docker) solve kerberos docker conflict (#47260)
117cb96b0a8 is described below
commit 117cb96b0a8416bb6acefac3645b31104c33b001
Author: zgxme <zhenggaoxi...@selectdb.com>
AuthorDate: Tue Jan 21 16:48:12 2025 +0800
[fix](docker) solve kerberos docker conflict (#47260)
---
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 a581baa6cfa..6e3561706f7 100755
--- a/docker/thirdparties/run-thirdparties-docker.sh
+++ b/docker/thirdparties/run-thirdparties-docker.sh
@@ -597,7 +597,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
@@ -605,7 +604,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
