fix

.github/workflows/test.yml

@@ -102,6 +102,9 @@ jobs:
  sudo curl -L https://github.com/docker/compose/releases/download/${{ matrix.compose_version }}/docker-compose-`uname -s`-`uname -m` -o "${{ matrix.compose_path }}/docker-compose"
  sudo chmod +x "${{ matrix.compose_path }}/docker-compose"
 
+ - name: Ensure runner is owner of /var/lib/docker to set permissions of docker volumes
+ run: sudo chown -R $(whoami):$(whoami) /var/lib/docker
+
  - name: Install self-hosted
  uses: nick-fields/retry@v3
  with:

_integration-test/conftest.py

@@ -52,7 +52,7 @@ def configure_self_hosted_environment(request):
  with open("sentry/requirements.txt", "w") as req_file:
  req_file.write("python-ldap\n")
  os.environ["MINIMIZE_DOWNTIME"] = "1"
- subprocess.run(["./install.sh"], check=True)
+ subprocess.run(["./install.sh"], check=True, capture_output=True)
  # Create test user
  subprocess.run(
  [

install.sh

@@ -21,8 +21,8 @@ source install/check-minimum-requirements.sh
 
 # Let's go! Start impacting things.
 source install/turn-things-off.sh
-source install/create-docker-volumes.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
 source install/ensure-relay-credentials.sh

install/update-docker-volume-permissions.sh

@@ -1,9 +1,9 @@
 echo "${_group}Ensuring Kafka and Zookeeper volumes have correct permissions ..."
 
-if [[ "$DOCKER_PLATFORM" = "linux/amd64" ]]; then
+if [[ "$DOCKER_PLATFORM" = "linux/amd64" && -n "$(docker volume ls -q -f name=sentry-zookeeper)" && -n "$(docker volume ls -q -f name=sentry-kafka)" ]]; then
  chmod -R a+w /var/lib/docker/volumes/sentry-zookeeper/_data
- chmod -R a+w  /var/lib/docker/volumes/sentry-kafka/_data
- chmod -R a+w  /var/lib/docker/volumes/sentry-self-hosted_sentry-zookeeper-log/_data
+ chmod -R a+w /var/lib/docker/volumes/sentry-kafka/_data
+ chmod -R a+w /var/lib/docker/volumes/sentry-self-hosted_sentry-zookeeper-log/_data
 fi
 
 echo "${_endgroup}"