Skip to content

feat(compose): Add ability to use custom images for any Sentry service #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2020
Merged

feat(compose): Add ability to use custom images for any Sentry service #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
COMPOSE_PROJECT_NAME=sentry_onpremise
SENTRY_EVENT_RETENTION_DAYS=90
SENTRY_VERSION=latest
SYMBOLICATOR_VERSION=latest
SENTRY_IMAGE=getsentry/sentry:latest
SNUBA_IMAGE=getsentry/snuba:latest
RELAY_IMAGE=getsentry/relay:latest
SYMBOLICATOR_IMAGE=getsentry/symbolicator:eac35a6058c7749bdf20ed219a377e49e02d0b76
11 changes: 5 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ x-sentry-defaults: &sentry_defaults
context: ./sentry
args:
- SENTRY_IMAGE
- SENTRY_VERSION
image: sentry-onpremise-local
depends_on:
- redis
Expand All @@ -34,7 +33,7 @@ x-snuba-defaults: &snuba_defaults
- redis
- clickhouse
- kafka
image: 'getsentry/snuba:$SENTRY_VERSION'
image: '$SNUBA_IMAGE'
environment:
SNUBA_SETTINGS: docker
CLICKHOUSE_HOST: clickhouse
Expand Down Expand Up @@ -134,11 +133,11 @@ services:
build:
context: ./cron
args:
BASE_IMAGE: 'getsentry/snuba:$SENTRY_VERSION'
BASE_IMAGE: '$SNUBA_IMAGE'
command: '"*/5 * * * * gosu snuba snuba cleanup --dry-run False"'
symbolicator:
<< : *restart_policy
image: 'getsentry/symbolicator:$SYMBOLICATOR_VERSION'
image: '$SYMBOLICATOR_IMAGE'
volumes:
- 'sentry-symbolicator:/data'
- type: bind
Expand All @@ -152,7 +151,7 @@ services:
build:
context: ./cron
args:
BASE_IMAGE: 'getsentry/symbolicator:$SYMBOLICATOR_VERSION'
BASE_IMAGE: '$SYMBOLICATOR_IMAGE'
command: '"55 23 * * * gosu symbolicator symbolicator cleanup"'
volumes:
- 'sentry-symbolicator:/data'
Expand Down Expand Up @@ -194,7 +193,7 @@ services:
- relay
relay:
<< : *restart_policy
image: 'getsentry/relay:$SENTRY_VERSION'
image: '$RELAY_IMAGE'
volumes:
- type: bind
read_only: true
Expand Down
4 changes: 2 additions & 2 deletions scripts/bump-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ NEW_VERSION="$2"

SYMBOLICATOR_VERSION=$(curl -sSL 'https://api.github.com/repos/getsentry/symbolicator/git/refs/heads/master' | grep -Po '(?<=\"sha\": \")([a-f0-9]{5,40})(?=\",?)')

sed -i -e "s/^SYMBOLICATOR_VERSION=.*\$/SYMBOLICATOR_VERSION=$SYMBOLICATOR_VERSION/" .env
sed -i -e "s/^SENTRY_VERSION=.*\$/SENTRY_VERSION=$NEW_VERSION/" .env
sed -i -e "s/^SYMBOLICATOR_IMAGE=\([^:]\+\):.\+\$/SYMBOLICATOR_IMAGE=\1:$SYMBOLICATOR_VERSION/" .env
sed -i -e "s/^\(SENTRY\|SNUBA\|RELAY\)_IMAGE=\([^:]\+\):.\+\$/\1_IMAGE=\2:$NEW_VERSION/" .env
sed -i -e "s/^\# Sentry .* On-Premise/# Sentry $NEW_VERSION On-Premise/" README.md
sed -i -e "s/\(Change Date:\s*\)[-0-9]\+\$/\\1$(date +'%Y-%m-%d' -d '3 years')/" LICENSE

Expand Down
3 changes: 1 addition & 2 deletions sentry/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
ARG SENTRY_VERSION=latest
ARG SENTRY_IMAGE
FROM ${SENTRY_IMAGE:-getsentry/sentry:$SENTRY_VERSION}
FROM ${SENTRY_IMAGE}

COPY . /usr/src/sentry

Expand Down