diff --git a/install.sh b/install.sh old mode 100755 new mode 100644 index 99a2dce..32c9fa1 --- a/install.sh +++ b/install.sh @@ -10,10 +10,6 @@ dcr="$dc run --rm" log_file="sentry_install_log-`date +'%Y-%m-%d_%H-%M-%S'`.txt" exec &> >(tee -a "$log_file") -MIN_DOCKER_VERSION='17.05.0' -MIN_COMPOSE_VERSION='1.23.0' -MIN_RAM=2400 # MB - SENTRY_CONFIG_PY='sentry/sentry.conf.py' SENTRY_CONFIG_YML='sentry/config.yml' SYMBOLICATOR_CONFIG_YML='symbolicator/config.yml' @@ -54,7 +50,7 @@ echo "" # We tag locally built images with an '-onpremise-local' suffix. docker-compose pull tries to pull these too and # shows a 404 error on the console which is confusing and unnecessary. To overcome this, we add the stderr>stdout # redirection below and pass it through grep, ignoring all lines having this '-onpremise-local' suffix. -$dc pull -q --ignore-pull-failures 2>&1 | grep -v -- -onpremise-local || true +$dc pull --quiet --ignore-pull-failures 2>&1 | grep -v -- -onpremise-local || true # We may not have the set image on the repo (local images) so allow fails docker pull $SENTRY_IMAGE || true; @@ -64,7 +60,7 @@ echo "Building and tagging Docker images..." echo "" # Build the sentry onpremise image first as it is needed for the cron image $dc build --force-rm web -$dc build --force-rm --parallel +$dc build --force-rm echo "" echo "Docker images built."