From 7c71f5bf805ebbd113e55b799d04795eb3bc149b Mon Sep 17 00:00:00 2001 From: NullIsNot0 Date: Wed, 15 Jul 2020 22:36:26 +0300 Subject: [PATCH 1/2] Make images versions configurable By default `SENTRY_VERSION=latest` in `.env`, but if I set it to `SENTRY_VERSION=b7d0b43` then install script fails, because there is no such image tag for `getsentry/snuba` and `getsentry/relay`, but `docker-compose.yml` contained `image: 'getsentry/snuba:$SENTRY_VERSION'` and `image: 'getsentry/relay:$SENTRY_VERSION'`. I propose to make configurable tags for snuba and relay images. --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d6bc992595e..2df00799d2e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,7 @@ x-snuba-defaults: &snuba_defaults - redis - clickhouse - kafka - image: 'getsentry/snuba:$SENTRY_VERSION' + image: 'getsentry/snuba:$SNUBA_VERSION' environment: SNUBA_SETTINGS: docker CLICKHOUSE_HOST: clickhouse @@ -134,7 +134,7 @@ services: build: context: ./cron args: - BASE_IMAGE: 'getsentry/snuba:$SENTRY_VERSION' + BASE_IMAGE: 'getsentry/snuba:$SNUBA_VERSION' command: '"*/5 * * * * gosu snuba snuba cleanup --dry-run False"' symbolicator: << : *restart_policy @@ -194,7 +194,7 @@ services: - relay relay: << : *restart_policy - image: 'getsentry/relay:$SENTRY_VERSION' + image: 'getsentry/relay:$RELAY_VERSION' volumes: - type: bind read_only: true From 927bc954bd422927dc45a92b4f3a10103dfb38c6 Mon Sep 17 00:00:00 2001 From: NullIsNot0 Date: Wed, 15 Jul 2020 22:37:19 +0300 Subject: [PATCH 2/2] Update .env --- .env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env b/.env index aec59cb371a..d2f6287243b 100644 --- a/.env +++ b/.env @@ -2,3 +2,5 @@ COMPOSE_PROJECT_NAME=sentry_onpremise SENTRY_EVENT_RETENTION_DAYS=90 SENTRY_VERSION=latest SYMBOLICATOR_VERSION=latest +SNUBA_VERSION=latest +RELAY_VERSION=latest