Sentry 8.6

[mattrobenolt]

🎉 https://github.com/getsentry/sentry/releases/tag/8.6.0 🎉

[yosifkit]

Build test of #1908; bb6960c (sentry):

$ bashbrew build sentry:8.5.1
Pulling python:2.7.11-slim (sentry:8.5.1)
Building bashbrew/cache:ca5d94ad7fe873ccca050f37464dee09552c9922a6d6f4802de77957d14b4741 (sentry:8.5.1)
Tagging sentry:8.5.1
Tagging sentry:8.5

$ test/run.sh sentry:8.5.1
testing sentry:8.5.1
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed


$ bashbrew build sentry:8.5.1-onbuild
Building bashbrew/cache:8338e7965197f73513b3f4bc3d776245b0b3a44421842d25c425946db2787e93 (sentry:8.5.1-onbuild)
Tagging sentry:8.5.1-onbuild
Tagging sentry:8.5-onbuild

$ test/run.sh sentry:8.5.1-onbuild
testing sentry:8.5.1-onbuild
    'override-cmd' [1/1]...passed


$ bashbrew build sentry:8.6.0
Building bashbrew/cache:c1eb2beb5b16a411ff0eb6a92b3a927a6e83144622153269490296624f23d490 (sentry:8.6.0)
Tagging sentry:8.6.0
Tagging sentry:8.6
Tagging sentry:8
Tagging sentry:latest

$ test/run.sh sentry:8.6.0
testing sentry:8.6.0
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed


$ bashbrew build sentry:8.6.0-onbuild
Building bashbrew/cache:ab09d47a8ab0c21874b1e5b723db0feb74c8d3a709c7fd3e768a8590f18a0a84 (sentry:8.6.0-onbuild)
Tagging sentry:8.6.0-onbuild
Tagging sentry:8.6-onbuild
Tagging sentry:8-onbuild
Tagging sentry:onbuild

$ test/run.sh sentry:8.6.0-onbuild
testing sentry:8.6.0-onbuild
    'override-cmd' [1/1]...passed

[tianon]

diff --git a/sentry_8.4-onbuild/Dockerfile b/sentry_8.4-onbuild/Dockerfile
deleted file mode 100644
index beb17f1..0000000
diff --git a/sentry_8.4/Dockerfile b/sentry_8.4/Dockerfile
deleted file mode 100644
index 157b3f3..0000000
diff --git a/sentry_8.4/docker-entrypoint.sh b/sentry_8.4/docker-entrypoint.sh
deleted file mode 100755
index 682e40d..0000000
diff --git a/sentry_onbuild/Dockerfile b/sentry_8.5-onbuild/Dockerfile
similarity index 100%
copy from sentry_onbuild/Dockerfile
copy to sentry_8.5-onbuild/Dockerfile
diff --git a/sentry_latest/Dockerfile b/sentry_8.5/Dockerfile
similarity index 100%
copy from sentry_latest/Dockerfile
copy to sentry_8.5/Dockerfile
diff --git a/sentry_8.4/config.yml b/sentry_8.5/config.yml
similarity index 100%
rename from sentry_8.4/config.yml
rename to sentry_8.5/config.yml
diff --git a/sentry_latest/docker-entrypoint.sh b/sentry_8.5/docker-entrypoint.sh
similarity index 100%
copy from sentry_latest/docker-entrypoint.sh
copy to sentry_8.5/docker-entrypoint.sh
diff --git a/sentry_8.4/sentry.conf.py b/sentry_8.5/sentry.conf.py
similarity index 97%
rename from sentry_8.4/sentry.conf.py
rename to sentry_8.5/sentry.conf.py
index b9f5e21..310a770 100644
--- a/sentry_8.4/sentry.conf.py
+++ b/sentry_8.5/sentry.conf.py
@@ -12,6 +12,7 @@
 #  SENTRY_RABBITMQ_PASSWORD
 #  SENTRY_RABBITMQ_VHOST
 #  SENTRY_REDIS_HOST
+#  SENTRY_REDIS_PASSWORD
 #  SENTRY_REDIS_PORT
 #  SENTRY_REDIS_DB
 #  SENTRY_MEMCACHED_HOST
@@ -94,6 +95,7 @@ redis = env('SENTRY_REDIS_HOST') or (env('REDIS_PORT_6379_TCP_ADDR') and 'redis'
 if not redis:
     raise Exception('Error: REDIS_PORT_6379_TCP_ADDR (or SENTRY_REDIS_HOST) is undefined, did you forget to `--link` a redis container?')

+redis_password = env('SENTRY_REDIS_PASSWORD') or ''
 redis_port = env('SENTRY_REDIS_PORT') or '6379'
 redis_db = env('SENTRY_REDIS_DB') or '0'

@@ -103,6 +105,7 @@ SENTRY_OPTIONS.update({
             'hosts': {
                 0: {
                     'host': redis,
+                    'password': redis_password,
                     'port': redis_port,
                     'db': redis_db,
                 },
@@ -162,7 +165,7 @@ if rabbitmq:
         )
     )
 else:
-    BROKER_URL = 'redis://' + redis + ':' + redis_port + '/' + redis_db
+    BROKER_URL = 'redis://:' + redis_password + '@' + redis + ':' + redis_port + '/' + redis_db


 ###############
@@ -216,7 +219,7 @@ SENTRY_DIGESTS = 'sentry.digests.backends.redis.RedisBackend'
 ################

 # Any Django storage backend is compatible with Sentry. For more solutions see
-# the django-storages package: https://django-storages.readthedocs.org/en/latest/
+# the django-storages package: https://django-storages.readthedocs.io/en/latest/

 SENTRY_FILESTORE = 'django.core.files.storage.FileSystemStorage'
 SENTRY_FILESTORE_OPTIONS = {
diff --git a/sentry_latest/Dockerfile b/sentry_latest/Dockerfile
index 4d08d31..c645bdd 100644
--- a/sentry_latest/Dockerfile
+++ b/sentry_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2.7.11-slim
+FROM python:2.7.12-slim

 # add our user and group first to make sure their IDs get assigned consistently
 RUN groupadd -r sentry && useradd -r -m -g sentry sentry
@@ -19,7 +19,7 @@ ENV PIP_NO_CACHE_DIR off
 ENV PIP_DISABLE_PIP_VERSION_CHECK on

 # grab gosu for easy step-down from root
-ENV GOSU_VERSION 1.7
+ENV GOSU_VERSION 1.9
 RUN set -x \
     && apt-get update && apt-get install -y --no-install-recommends wget && rm -rf /var/lib/apt/lists/* \
     && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
@@ -49,7 +49,7 @@ RUN set -x \
 # Support for RabbitMQ
 RUN pip install librabbitmq==1.6.1

-ENV SENTRY_VERSION 8.5.1
+ENV SENTRY_VERSION 8.6.0

 RUN pip install sentry==$SENTRY_VERSION

diff --git a/sentry_latest/docker-entrypoint.sh b/sentry_latest/docker-entrypoint.sh
index 5908ba1..7ad4cb8 100755
--- a/sentry_latest/docker-entrypoint.sh
+++ b/sentry_latest/docker-entrypoint.sh
@@ -12,9 +12,6 @@ case "$1" in
    celery|cleanup|config|createuser|devserver|django|export|help|import|init|plugins|queues|repair|run|shell|start|tsdb|upgrade)
        set -- sentry "$@"
    ;;
-   generate-secret-key)
-       set -- sentry config generate-secret-key
-   ;;
 esac

 if [ "$1" = 'sentry' ]; then
diff --git a/sentry_latest/sentry.conf.py b/sentry_latest/sentry.conf.py
index b9f5e21..310a770 100644
--- a/sentry_latest/sentry.conf.py
+++ b/sentry_latest/sentry.conf.py
@@ -12,6 +12,7 @@
 #  SENTRY_RABBITMQ_PASSWORD
 #  SENTRY_RABBITMQ_VHOST
 #  SENTRY_REDIS_HOST
+#  SENTRY_REDIS_PASSWORD
 #  SENTRY_REDIS_PORT
 #  SENTRY_REDIS_DB
 #  SENTRY_MEMCACHED_HOST
@@ -94,6 +95,7 @@ redis = env('SENTRY_REDIS_HOST') or (env('REDIS_PORT_6379_TCP_ADDR') and 'redis'
 if not redis:
     raise Exception('Error: REDIS_PORT_6379_TCP_ADDR (or SENTRY_REDIS_HOST) is undefined, did you forget to `--link` a redis container?')

+redis_password = env('SENTRY_REDIS_PASSWORD') or ''
 redis_port = env('SENTRY_REDIS_PORT') or '6379'
 redis_db = env('SENTRY_REDIS_DB') or '0'

@@ -103,6 +105,7 @@ SENTRY_OPTIONS.update({
             'hosts': {
                 0: {
                     'host': redis,
+                    'password': redis_password,
                     'port': redis_port,
                     'db': redis_db,
                 },
@@ -162,7 +165,7 @@ if rabbitmq:
         )
     )
 else:
-    BROKER_URL = 'redis://' + redis + ':' + redis_port + '/' + redis_db
+    BROKER_URL = 'redis://:' + redis_password + '@' + redis + ':' + redis_port + '/' + redis_db


 ###############
@@ -216,7 +219,7 @@ SENTRY_DIGESTS = 'sentry.digests.backends.redis.RedisBackend'
 ################

 # Any Django storage backend is compatible with Sentry. For more solutions see
-# the django-storages package: https://django-storages.readthedocs.org/en/latest/
+# the django-storages package: https://django-storages.readthedocs.io/en/latest/

 SENTRY_FILESTORE = 'django.core.files.storage.FileSystemStorage'
 SENTRY_FILESTORE_OPTIONS = {
diff --git a/sentry_onbuild/Dockerfile b/sentry_onbuild/Dockerfile
index f5823cb..9aa6d22 100644
--- a/sentry_onbuild/Dockerfile
+++ b/sentry_onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM sentry:8.5
+FROM sentry:8.6

 WORKDIR /usr/src/sentry

[tianon]

LGTM 🎉