Sentry 8.10 #2300
Merged
Sentry 8.10 #2300
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/sentry_8.8-onbuild/Dockerfile b/sentry_8.8-onbuild/Dockerfile
deleted file mode 100644
index b8ac26d..0000000
diff --git a/sentry_8.8/Dockerfile b/sentry_8.8/Dockerfile
deleted file mode 100644
index d60cde9..0000000
diff --git a/sentry_onbuild/Dockerfile b/sentry_8.9-onbuild/Dockerfile
similarity index 100%
copy from sentry_onbuild/Dockerfile
copy to sentry_8.9-onbuild/Dockerfile
diff --git a/sentry_latest/Dockerfile b/sentry_8.9/Dockerfile
similarity index 100%
copy from sentry_latest/Dockerfile
copy to sentry_8.9/Dockerfile
diff --git a/sentry_8.8/config.yml b/sentry_8.9/config.yml
similarity index 100%
rename from sentry_8.8/config.yml
rename to sentry_8.9/config.yml
diff --git a/sentry_8.8/docker-entrypoint.sh b/sentry_8.9/docker-entrypoint.sh
similarity index 100%
rename from sentry_8.8/docker-entrypoint.sh
rename to sentry_8.9/docker-entrypoint.sh
diff --git a/sentry_8.8/sentry.conf.py b/sentry_8.9/sentry.conf.py
similarity index 100%
rename from sentry_8.8/sentry.conf.py
rename to sentry_8.9/sentry.conf.py
diff --git a/sentry_latest/Dockerfile b/sentry_latest/Dockerfile
index 7f03661..294c518 100644
--- a/sentry_latest/Dockerfile
+++ b/sentry_latest/Dockerfile
@@ -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.9
+ENV GOSU_VERSION 1.10
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)" \
@@ -33,7 +33,7 @@ RUN set -x \
&& apt-get purge -y --auto-remove wget
# grab tini for signal processing and zombie killing
-ENV TINI_VERSION v0.9.0
+ENV TINI_VERSION v0.10.0
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/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini" \
@@ -53,9 +53,26 @@ RUN set -x \
&& python -c 'import librabbitmq' \
&& apt-get purge -y --auto-remove make
-ENV SENTRY_VERSION 8.9.0
+ENV SENTRY_VERSION 8.10.0
-RUN pip install sentry==$SENTRY_VERSION
+RUN set -x \
+ && apt-get update && apt-get install -y --no-install-recommends wget && rm -rf /var/lib/apt/lists/* \
+ && mkdir -p /usr/src/sentry \
+ && wget -O /usr/src/sentry/sentry-${SENTRY_VERSION}-py27-none-any.whl "https://github.com/getsentry/sentry/releases/download/${SENTRY_VERSION}/sentry-${SENTRY_VERSION}-py27-none-any.whl" \
+ && wget -O /usr/src/sentry/sentry-${SENTRY_VERSION}-py27-none-any.whl.asc "https://github.com/getsentry/sentry/releases/download/${SENTRY_VERSION}/sentry-${SENTRY_VERSION}-py27-none-any.whl.asc" \
+ && wget -O /usr/src/sentry/sentry_plugins-${SENTRY_VERSION}-py2.py3-none-any.whl "https://github.com/getsentry/sentry/releases/download/${SENTRY_VERSION}/sentry_plugins-${SENTRY_VERSION}-py2.py3-none-any.whl" \
+ && wget -O /usr/src/sentry/sentry_plugins-${SENTRY_VERSION}-py2.py3-none-any.whl.asc "https://github.com/getsentry/sentry/releases/download/${SENTRY_VERSION}/sentry_plugins-${SENTRY_VERSION}-py2.py3-none-any.whl.asc" \
+ && export GNUPGHOME="$(mktemp -d)" \
+ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys D8749766A66DD714236A932C3B2D400CE5BBCA60 \
+ && gpg --batch --verify /usr/src/sentry/sentry-${SENTRY_VERSION}-py27-none-any.whl.asc /usr/src/sentry/sentry-${SENTRY_VERSION}-py27-none-any.whl \
+ && gpg --batch --verify /usr/src/sentry/sentry_plugins-${SENTRY_VERSION}-py2.py3-none-any.whl.asc /usr/src/sentry/sentry_plugins-${SENTRY_VERSION}-py2.py3-none-any.whl \
+ && pip install \
+ /usr/src/sentry/sentry-${SENTRY_VERSION}-py27-none-any.whl \
+ /usr/src/sentry/sentry_plugins-${SENTRY_VERSION}-py2.py3-none-any.whl \
+ && sentry --help \
+ && sentry plugins list \
+ && rm -r "$GNUPGHOME" /usr/src/sentry \
+ && apt-get purge -y --auto-remove wget
ENV SENTRY_CONF=/etc/sentry \
SENTRY_FILESTORE_DIR=/var/lib/sentry/files
diff --git a/sentry_latest/config.yml b/sentry_latest/config.yml
index 433b9dc..8a08445 100644
--- a/sentry_latest/config.yml
+++ b/sentry_latest/config.yml
@@ -44,3 +44,20 @@
# 0:
# host: 127.0.0.1
# port: 6379
+
+################
+# File storage #
+################
+
+# Uploaded media uses these `filestore` settings. The available
+# backends are either `filesystem` or `s3`.
+
+# filestore.backend: 'filesystem'
+# filestore.options:
+# location: '/tmp/sentry-files'
+
+# filestore.backend: 's3'
+# filestore.options:
+# access_key: 'AKIXXXXXX'
+# secret_key: 'XXXXXXX'
+# bucket_name: 's3-bucket-name'
diff --git a/sentry_latest/sentry.conf.py b/sentry_latest/sentry.conf.py
index 310a770..9176307 100644
--- a/sentry_latest/sentry.conf.py
+++ b/sentry_latest/sentry.conf.py
@@ -29,6 +29,10 @@
# SENTRY_MAILGUN_API_KEY
# SENTRY_SINGLE_ORGANIZATION
# SENTRY_SECRET_KEY
+# GITHUB_APP_ID
+# GITHUB_API_SECRET
+# BITBUCKET_CONSUMER_KEY
+# BITBUCKET_CONSUMER_SECRET
from sentry.conf.server import * # NOQA
from sentry.utils.types import Bool
@@ -218,11 +222,11 @@ SENTRY_DIGESTS = 'sentry.digests.backends.redis.RedisBackend'
# File storage #
################
-# Any Django storage backend is compatible with Sentry. For more solutions see
-# the django-storages package: https://django-storages.readthedocs.io/en/latest/
+# Uploaded media uses these `filestore` settings. The available
+# backends are either `filesystem` or `s3`.
-SENTRY_FILESTORE = 'django.core.files.storage.FileSystemStorage'
-SENTRY_FILESTORE_OPTIONS = {
+SENTRY_OPTIONS['filestore.backend'] = 'filesystem'
+SENTRY_OPTIONS['filestore.options'] = {
'location': env('SENTRY_FILESTORE_DIR'),
}
@@ -237,6 +241,7 @@ if Bool(env('SENTRY_USE_SSL', False)):
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
SESSION_COOKIE_SECURE = True
CSRF_COOKIE_SECURE = True
+ SOCIAL_AUTH_REDIRECT_IS_HTTPS = True
SENTRY_WEB_HOST = '0.0.0.0'
SENTRY_WEB_PORT = 9000
@@ -292,3 +297,12 @@ if 'SENTRY_RUNNING_UWSGI' not in os.environ and len(secret_key) < 32:
print('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
SENTRY_OPTIONS['system.secret-key'] = secret_key
+
+if 'GITHUB_APP_ID' in os.environ:
+ GITHUB_EXTENDED_PERMISSIONS = ['repo']
+ GITHUB_APP_ID = env('GITHUB_APP_ID')
+ GITHUB_API_SECRET = env('GITHUB_API_SECRET')
+
+if 'BITBUCKET_CONSUMER_KEY' in os.environ:
+ BITBUCKET_CONSUMER_KEY = env('BITBUCKET_CONSUMER_KEY')
+ BITBUCKET_CONSUMER_SECRET = env('BITBUCKET_CONSUMER_SECRET')
diff --git a/sentry_onbuild/Dockerfile b/sentry_onbuild/Dockerfile
index 1d509ea..9bdb9ea 100644
--- a/sentry_onbuild/Dockerfile
+++ b/sentry_onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM sentry:8.9
+FROM sentry:8.10
WORKDIR /usr/src/sentry
|
|
LGTM Build test of #2300; e809b8d ( $ bashbrew build sentry:8.10.0
Building bashbrew/cache:84b6031b57583b38353d86e4d22e409a105a52c9fadacb8f918362d2be96d8e2 (sentry:8.10.0)
Tagging sentry:8.10.0
Tagging sentry:8.10
Tagging sentry:8
Tagging sentry:latest
$ test/run.sh sentry:8.10.0
testing sentry:8.10.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.10.0-onbuild
Building bashbrew/cache:9fcd67168324fca60b21bc567427191804a4a9b89277ab310ed28832c64c7c9b (sentry:8.10.0-onbuild)
Tagging sentry:8.10.0-onbuild
Tagging sentry:8.10-onbuild
Tagging sentry:8-onbuild
Tagging sentry:onbuild
$ test/run.sh sentry:8.10.0-onbuild
testing sentry:8.10.0-onbuild
'override-cmd' [1/1]...passed
$ bashbrew build sentry:8.9.0
Building bashbrew/cache:71516cd3d37e8524f35d64f4d2f930457738d78a7b480027220dcc6e0b16dd24 (sentry:8.9.0)
Tagging sentry:8.9.0
Tagging sentry:8.9
$ test/run.sh sentry:8.9.0
testing sentry:8.9.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.9.0-onbuild
Building bashbrew/cache:c0a6846012ad2a489201e993e8aab2283eac3edff72f5b7b22c48b4653a949e3 (sentry:8.9.0-onbuild)
Tagging sentry:8.9.0-onbuild
Tagging sentry:8.9-onbuild
$ test/run.sh sentry:8.9.0-onbuild
testing sentry:8.9.0-onbuild
'override-cmd' [1/1]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
✨ https://github.com/getsentry/sentry/releases/tag/8.10.0 ✨