Skip to content

Commit 0dabb5a

Browse files
Different approach to editing permissions of docker volumes (#3084)
* different approach to editing permissions of docker volumes
1 parent ede1e6f commit 0dabb5a

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

.github/workflows/test.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ jobs:
7373
uses: actions/checkout@v4
7474

7575
- name: Install current ref
76-
run: |
77-
# Hacky way to get around permissioning issues in update-docker-volume-permissions.sh script
78-
sudo -E ./install.sh
76+
run: ./install.sh
7977

8078
integration-test:
8179
if: github.repository_owner == 'getsentry'

install/update-docker-volume-permissions.sh

+2-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,8 @@ echo "${_group}Ensuring Kafka and Zookeeper volumes have correct permissions ...
22

33
# 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
44
# to change permissions of docker volumes since it is run in a VM.
5-
if [[ "$DOCKER_PLATFORM" = "linux/amd64" && -n "$(docker volume ls -q -f name=sentry-zookeeper)" && -n "$(docker volume ls -q -f name=sentry-kafka)" ]]; then
6-
docker_root_dir=$(docker info --format '{{.DockerRootDir}}')
7-
zookeeper_data_dir="${docker_root_dir}/volumes/sentry-zookeeper/_data"
8-
kafka_data_dir="${docker_root_dir}/volumes/sentry-kafka/_data"
9-
zookeeper_log_data_dir="${docker_root_dir}/volumes/${COMPOSE_PROJECT_NAME}_sentry-zookeeper-log/_data"
10-
chmod -R a+w $zookeeper_data_dir $kafka_data_dir $zookeeper_log_data_dir && returncode=$? || returncode=$?
11-
if [[ $returncode == "1" ]]; then
12-
echo "WARNING: Error when setting appropriate permissions for zookeeper, kafka, and zookeeper log docker volumes. This may corrupt your self-hosted install. See https://github.com/confluentinc/kafka-images/issues/127 for context on why this was added."
13-
fi
5+
if [[ -n "$(docker volume ls -q -f name=sentry-zookeeper)" && -n "$(docker volume ls -q -f name=sentry-kafka)" ]]; then
6+
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
147
fi
158

169
echo "${_endgroup}"

0 commit comments

Comments
 (0)