diff --git a/.travis.yml b/.travis.yml index b079f4d..243de20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: bash services: docker env: - - IMAGE=sentry:9.1.2 - - IMAGE=getsentry/sentry:git + - SENTRY_IMAGE=sentry:9.1.2 + - SENTRY_IMAGE=getsentry/sentry:git script: - ./install.sh diff --git a/Dockerfile b/Dockerfile index bbd3044..50a59ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ -ARG IMAGE=sentry:9.1.2 -FROM ${IMAGE}-onbuild +ARG SENTRY_IMAGE +FROM ${SENTRY_IMAGE}-onbuild diff --git a/docker-compose.yml b/docker-compose.yml index bcc9cb4..20d688c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ x-defaults: &defaults build: context: . args: - IMAGE: ${IMAGE} + SENTRY_IMAGE: ${SENTRY_IMAGE} depends_on: - redis - postgres diff --git a/install.sh b/install.sh index c9fd564..d3af603 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -e +LATEST_STABLE_SENTRY_IMAGE='sentry:9.1.2' + MIN_DOCKER_VERSION='17.05.0' MIN_COMPOSE_VERSION='1.17.0' MIN_RAM=3072 # MB @@ -55,6 +57,12 @@ else cp -n .env.example "$ENV_FILE" fi +if [ -z $SENTRY_IMAGE ]; then + echo "" + echo "\$SENTRY_IMAGE not set, using latest stable: $LATEST_STABLE_SENTRY_IMAGE"; + export SENTRY_IMAGE=$LATEST_STABLE_SENTRY_IMAGE +fi + echo "" echo "Building and tagging Docker images..." echo ""