From 812b2907db97b7f98a187cde121a84e439c7485f Mon Sep 17 00:00:00 2001
From: hubertdeng123 <hubertdeng123@gmail.com>
Date: Tue, 31 Dec 2024 10:27:01 -0800
Subject: [PATCH 1/2] remove everything zookeeper
---
install/update-docker-volume-permissions.sh | 9 ---------
install/wrap-up.sh | 5 -----
2 files changed, 14 deletions(-)
delete mode 100644 install/update-docker-volume-permissions.sh
diff --git a/install/update-docker-volume-permissions.sh b/install/update-docker-volume-permissions.sh
deleted file mode 100644
index 8ac0be400c..0000000000
--- a/install/update-docker-volume-permissions.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-echo "${_group}Ensuring Kafka and Zookeeper volumes have correct permissions ..."
-
-# Only supporting platforms on linux x86 platforms and not apple silicon. I'm assuming that folks using apple silicon are doing it for dev purposes and it's difficult
-# to change permissions of docker volumes since it is run in a VM.
-if [[ -n "$(docker volume ls -q -f name=sentry-zookeeper)" && -n "$(docker volume ls -q -f name=sentry-kafka)" ]]; then
- docker run --rm -v "sentry-zookeeper:/sentry-zookeeper-data" -v "sentry-kafka:/sentry-kafka-data" -v "${COMPOSE_PROJECT_NAME}_sentry-zookeeper-log:/sentry-zookeeper-log-data" busybox chmod -R a+w /sentry-zookeeper-data /sentry-kafka-data /sentry-zookeeper-log-data
-fi
-
-echo "${_endgroup}"
diff --git a/install/wrap-up.sh b/install/wrap-up.sh
index c301c823f2..dcc4e33c21 100644
--- a/install/wrap-up.sh
+++ b/install/wrap-up.sh
@@ -28,8 +28,3 @@ else
echo "-----------------------------------------------------------------"
echo ""
fi
-
-# TODO(getsentry/self-hosted#2489)
-if docker volume ls | grep -qw sentry-zookeeper; then
- docker volume rm sentry-zookeeper
-fi
From cb5b8376f88b33fb185e5c467ac2cfc459c6ae02 Mon Sep 17 00:00:00 2001
From: hubertdeng123 <hubertdeng123@gmail.com>
Date: Tue, 31 Dec 2024 10:29:57 -0800
Subject: [PATCH 2/2] remove sourced file from install script
---
install.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/install.sh b/install.sh
index e9460d36ce..23726ce97f 100755
--- a/install.sh
+++ b/install.sh
@@ -24,7 +24,6 @@ source install/check-minimum-requirements.sh
# in order to determine whether or not the clickhouse version needs to be upgraded.
source install/upgrade-clickhouse.sh
source install/turn-things-off.sh
-source install/update-docker-volume-permissions.sh
source install/create-docker-volumes.sh
source install/ensure-files-from-examples.sh
source install/check-memcached-backend.sh