diff --git a/.travis.yml b/.travis.yml index 243de20..07a67bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ services: docker env: - SENTRY_IMAGE=sentry:9.1.2 - - SENTRY_IMAGE=getsentry/sentry:git + - SENTRY_IMAGE=getsentry/sentry:latest script: - ./install.sh diff --git a/Dockerfile b/Dockerfile index 50a59ea..0a3dae5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1 @@ -ARG SENTRY_IMAGE -FROM ${SENTRY_IMAGE}-onbuild +FROM ${SENTRY_IMAGE:-sentry:9.1.2}-onbuild diff --git a/docker-compose.yml b/docker-compose.yml index 20d688c..18cee6a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,8 +12,6 @@ x-defaults: &defaults restart: unless-stopped build: context: . - args: - SENTRY_IMAGE: ${SENTRY_IMAGE} depends_on: - redis - postgres diff --git a/install.sh b/install.sh index d3af603..c9fd564 100755 --- a/install.sh +++ b/install.sh @@ -1,8 +1,6 @@ #!/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 @@ -57,12 +55,6 @@ 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 ""