diff --git a/docker-compose.yml b/docker-compose.yml index 230d22d2c0..2fcaaf894c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ x-healthcheck-defaults: &healthcheck_defaults # https://github.com/moby/moby/issues/39388 # https://github.com/getsentry/self-hosted/issues/1000 interval: 30s - timeout: 5s + timeout: 60s retries: 5 start_period: 10s x-sentry-defaults: &sentry_defaults diff --git a/install.sh b/install.sh index e32f76e6be..714856e1e9 100755 --- a/install.sh +++ b/install.sh @@ -1,26 +1,29 @@ #!/usr/bin/env bash set -e + +# Pre-pre-flight? 🤷 if [[ -n "$MSYSTEM" ]]; then echo "Seems like you are using an MSYS2-based system (such as Git Bash) which is not supported. Please use WSL instead."; exit 1 fi -umask 002 - source "$(dirname $0)/install/_lib.sh" # does a `cd .../install/`, among other things -source dc-detect-version.sh +# Pre-flight. No impact yet. source parse-cli.sh -source check-latest-commit.sh +source dc-detect-version.sh source error-handling.sh +source check-latest-commit.sh source check-minimum-requirements.sh + +# Let's go! Start impacting things. +source turn-things-off.sh source create-docker-volumes.sh source ensure-files-from-examples.sh source generate-secret-key.sh source replace-tsdb.sh source update-docker-images.sh source build-docker-images.sh -source turn-things-off.sh source set-up-zookeeper.sh source install-wal2json.sh source bootstrap-snuba.sh diff --git a/install/_lib.sh b/install/_lib.sh index 4af14804ae..f8a104b4a0 100644 --- a/install/_lib.sh +++ b/install/_lib.sh @@ -1,6 +1,9 @@ set -euo pipefail test "${DEBUG:-}" && set -x +# Override any user-supplied umask that could cause problems, see #1222 +umask 002 + # Thanks to https://unix.stackexchange.com/a/145654/108960 log_file="sentry_install_log-`date +'%Y-%m-%d_%H-%M-%S'`.txt" exec &> >(tee -a "$log_file") diff --git a/install/dc-detect-version.sh b/install/dc-detect-version.sh index 1631a11d8f..c2774009fc 100644 --- a/install/dc-detect-version.sh +++ b/install/dc-detect-version.sh @@ -1,3 +1,5 @@ +echo "${_group}Initializing Docker Compose ..." + # Some environments still use `docker-compose` even for Docker Compose v2. dc_base="$(docker compose version &> /dev/null && echo 'docker compose' || echo 'docker-compose')" if [[ "$(basename $0)" = "install.sh" ]]; then @@ -6,3 +8,5 @@ else dc="$dc_base --ansi never" fi dcr="$dc run --rm" + +echo "${_endgroup}"