Skip to content
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.

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

Sentry 8.22 #3729

Merged
merged 1 commit into from
Nov 20, 2017
Merged

Sentry 8.22 #3729

merged 1 commit into from
Nov 20, 2017

Conversation

mattrobenolt
Copy link
Contributor

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 57806dd..5539a5a 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,4 +1,4 @@
-sentry:8.20 @ amd64
-sentry:8.20-onbuild @ amd64
+sentry:8.21 @ amd64
+sentry:8.21-onbuild @ amd64
 sentry:latest @ amd64
 sentry:onbuild @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 85b309c..917f06e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,12 +1,12 @@
 sentry:8
 sentry:8-onbuild
-sentry:8.20
-sentry:8.20-onbuild
-sentry:8.20.0
-sentry:8.20.0-onbuild
 sentry:8.21
 sentry:8.21-onbuild
 sentry:8.21.0
 sentry:8.21.0-onbuild
+sentry:8.22
+sentry:8.22-onbuild
+sentry:8.22.0
+sentry:8.22.0-onbuild
 sentry:latest
 sentry:onbuild
diff --git a/sentry_8.20-onbuild/Dockerfile b/sentry_8.20-onbuild/Dockerfile
deleted file mode 100644
index 3388a33..0000000
diff --git a/sentry_8.20/Dockerfile b/sentry_8.20/Dockerfile
deleted file mode 100644
index 62459e9..0000000
diff --git a/sentry_onbuild/Dockerfile b/sentry_8.21-onbuild/Dockerfile
similarity index 100%
copy from sentry_onbuild/Dockerfile
copy to sentry_8.21-onbuild/Dockerfile
diff --git a/sentry_latest/Dockerfile b/sentry_8.21/Dockerfile
similarity index 100%
copy from sentry_latest/Dockerfile
copy to sentry_8.21/Dockerfile
diff --git a/sentry_8.20/config.yml b/sentry_8.21/config.yml
similarity index 100%
rename from sentry_8.20/config.yml
rename to sentry_8.21/config.yml
diff --git a/sentry_8.20/docker-entrypoint.sh b/sentry_8.21/docker-entrypoint.sh
similarity index 100%
rename from sentry_8.20/docker-entrypoint.sh
rename to sentry_8.21/docker-entrypoint.sh
diff --git a/sentry_8.20/sentry.conf.py b/sentry_8.21/sentry.conf.py
similarity index 100%
rename from sentry_8.20/sentry.conf.py
rename to sentry_8.21/sentry.conf.py
diff --git a/sentry_latest/Dockerfile b/sentry_latest/Dockerfile
index 18dea8c..e8bf750 100644
--- a/sentry_latest/Dockerfile
+++ b/sentry_latest/Dockerfile
@@ -53,7 +53,7 @@ RUN set -x \
     && python -c 'import librabbitmq' \
     && apt-get purge -y --auto-remove make
 
-ENV SENTRY_VERSION 8.21.0
+ENV SENTRY_VERSION 8.22.0
 
 RUN set -x \
     && apt-get update && apt-get install -y --no-install-recommends wget g++ && rm -rf /var/lib/apt/lists/* \
diff --git a/sentry_onbuild/Dockerfile b/sentry_onbuild/Dockerfile
index a19b8a9..03a98ac 100644
--- a/sentry_onbuild/Dockerfile
+++ b/sentry_onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM sentry:8.21
+FROM sentry:8.22
 
 WORKDIR /usr/src/sentry
 

@yosifkit
Copy link
Member

Build test of #3729; b7a6783; amd64 (sentry):

$ bashbrew build sentry:8.21.0
Building bashbrew/cache:55fc82ac76e4aa972c0ac8f30f78626d46ca4866aee50ac331bcf1ed063536dc (sentry:8.21.0)
Tagging sentry:8.21.0
Tagging sentry:8.21

$ test/run.sh sentry:8.21.0
testing sentry:8.21.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.21.0-onbuild
Building bashbrew/cache:f896bbdbfe8e7464ca5858559857d5f99099d630cdf229f7e348d94e0cd23e9b (sentry:8.21.0-onbuild)
Tagging sentry:8.21.0-onbuild
Tagging sentry:8.21-onbuild

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


$ bashbrew build sentry:8.22.0
Building bashbrew/cache:fb79b57012a2857c14900edd3cf02d97054760d5fa9aff56844a9148481117ba (sentry:8.22.0)
Tagging sentry:8.22.0
Tagging sentry:8.22
Tagging sentry:8
Tagging sentry:latest

$ test/run.sh sentry:8.22.0
testing sentry:8.22.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.22.0-onbuild
Building bashbrew/cache:adf1d5bb228b563361c8da5ef0c14eccd453cb91976fdc5aab57e1f4cb8c90f4 (sentry:8.22.0-onbuild)
Tagging sentry:8.22.0-onbuild
Tagging sentry:8.22-onbuild
Tagging sentry:8-onbuild
Tagging sentry:onbuild

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

@yosifkit yosifkit merged commit 0f6fcdc into docker-library:master Nov 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants