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.19 #3274

Merged
merged 1 commit into from
Aug 7, 2017
Merged

Sentry 8.19 #3274

merged 1 commit into from
Aug 7, 2017

Conversation

mattrobenolt
Copy link
Contributor

@tianon
Copy link
Member

tianon commented Aug 7, 2017

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 45ad30e..5518205 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,4 +1,4 @@
-sentry:8.17 @ amd64
-sentry:8.17-onbuild @ amd64
+sentry:8.18 @ amd64
+sentry:8.18-onbuild @ amd64
 sentry:latest @ amd64
 sentry:onbuild @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 079b12b..15b2b67 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,12 +1,12 @@
 sentry:8
 sentry:8-onbuild
-sentry:8.17
-sentry:8.17-onbuild
-sentry:8.17.0
-sentry:8.17.0-onbuild
 sentry:8.18
 sentry:8.18-onbuild
 sentry:8.18.0
 sentry:8.18.0-onbuild
+sentry:8.19
+sentry:8.19-onbuild
+sentry:8.19.0
+sentry:8.19.0-onbuild
 sentry:latest
 sentry:onbuild
diff --git a/sentry_8.17-onbuild/Dockerfile b/sentry_8.17-onbuild/Dockerfile
deleted file mode 100644
index c0fb206..0000000
diff --git a/sentry_8.17/Dockerfile b/sentry_8.17/Dockerfile
deleted file mode 100644
index a4baf90..0000000
diff --git a/sentry_onbuild/Dockerfile b/sentry_8.18-onbuild/Dockerfile
similarity index 100%
copy from sentry_onbuild/Dockerfile
copy to sentry_8.18-onbuild/Dockerfile
diff --git a/sentry_latest/Dockerfile b/sentry_8.18/Dockerfile
similarity index 100%
copy from sentry_latest/Dockerfile
copy to sentry_8.18/Dockerfile
diff --git a/sentry_8.17/config.yml b/sentry_8.18/config.yml
similarity index 100%
rename from sentry_8.17/config.yml
rename to sentry_8.18/config.yml
diff --git a/sentry_8.17/docker-entrypoint.sh b/sentry_8.18/docker-entrypoint.sh
similarity index 100%
rename from sentry_8.17/docker-entrypoint.sh
rename to sentry_8.18/docker-entrypoint.sh
diff --git a/sentry_8.17/sentry.conf.py b/sentry_8.18/sentry.conf.py
similarity index 100%
rename from sentry_8.17/sentry.conf.py
rename to sentry_8.18/sentry.conf.py
diff --git a/sentry_latest/Dockerfile b/sentry_latest/Dockerfile
index 888acec..2c6311c 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.18.0
+ENV SENTRY_VERSION 8.19.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 e9dbacc..1219d85 100644
--- a/sentry_onbuild/Dockerfile
+++ b/sentry_onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM sentry:8.18
+FROM sentry:8.19
 
 WORKDIR /usr/src/sentry
 

@tianon
Copy link
Member

tianon commented Aug 7, 2017

LGTM

Build test of #3274; 86c01ef (sentry):

$ bashbrew build sentry:8.18.0
Using bashbrew/cache:fa6ba2aee48a533d557983bf70132e48d4bd39bd27363feb3b952a1a40399975 (sentry:8.18.0)
Tagging sentry:8.18.0
Tagging sentry:8.18

$ test/run.sh sentry:8.18.0
testing sentry:8.18.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.18.0-onbuild
Using bashbrew/cache:722c8cc7574718d7d6cd5f07289293a73b83705468e44d99e0c551ce774fe73d (sentry:8.18.0-onbuild)
Tagging sentry:8.18.0-onbuild
Tagging sentry:8.18-onbuild

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


$ bashbrew build sentry:8.19.0
Building bashbrew/cache:06a63eeb75500bd6db7fa4289a573fd1aec02f7470c4212009fc79b1eb3c2e8f (sentry:8.19.0)
Tagging sentry:8.19.0
Tagging sentry:8.19
Tagging sentry:8
Tagging sentry:latest

$ test/run.sh sentry:8.19.0
testing sentry:8.19.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.19.0-onbuild
Building bashbrew/cache:a65380c8d421ae67d652425bcb4de082f916534f32ff2e80b97f76df5c2ca472 (sentry:8.19.0-onbuild)
Tagging sentry:8.19.0-onbuild
Tagging sentry:8.19-onbuild
Tagging sentry:8-onbuild
Tagging sentry:onbuild

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

@tianon tianon merged commit 152a017 into docker-library:master Aug 7, 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