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.11 #2412

Merged
merged 1 commit into from
Dec 2, 2016
Merged

Sentry 8.11 #2412

merged 1 commit into from
Dec 2, 2016

Conversation

mattrobenolt
Copy link
Contributor

@yosifkit
Copy link
Member

yosifkit commented Dec 2, 2016

diff --git a/sentry_onbuild/Dockerfile b/sentry_8.10-onbuild/Dockerfile
similarity index 100%
copy from sentry_onbuild/Dockerfile
copy to sentry_8.10-onbuild/Dockerfile
diff --git a/sentry_latest/Dockerfile b/sentry_8.10/Dockerfile
similarity index 100%
copy from sentry_latest/Dockerfile
copy to sentry_8.10/Dockerfile
diff --git a/sentry_latest/config.yml b/sentry_8.10/config.yml
similarity index 100%
copy from sentry_latest/config.yml
copy to sentry_8.10/config.yml
diff --git a/sentry_8.9/docker-entrypoint.sh b/sentry_8.10/docker-entrypoint.sh
similarity index 100%
rename from sentry_8.9/docker-entrypoint.sh
rename to sentry_8.10/docker-entrypoint.sh
diff --git a/sentry_latest/sentry.conf.py b/sentry_8.10/sentry.conf.py
similarity index 100%
copy from sentry_latest/sentry.conf.py
copy to sentry_8.10/sentry.conf.py
diff --git a/sentry_8.9-onbuild/Dockerfile b/sentry_8.9-onbuild/Dockerfile
deleted file mode 100644
index 1d509ea..0000000
diff --git a/sentry_8.9/Dockerfile b/sentry_8.9/Dockerfile
deleted file mode 100644
index 7f03661..0000000
diff --git a/sentry_8.9/config.yml b/sentry_8.9/config.yml
deleted file mode 100644
index 433b9dc..0000000
diff --git a/sentry_8.9/sentry.conf.py b/sentry_8.9/sentry.conf.py
deleted file mode 100644
index 310a770..0000000
diff --git a/sentry_latest/Dockerfile b/sentry_latest/Dockerfile
index 294c518..2ea20cd 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.10.0
+ENV SENTRY_VERSION 8.11.0
 
 RUN set -x \
     && apt-get update && apt-get install -y --no-install-recommends wget && rm -rf /var/lib/apt/lists/* \
diff --git a/sentry_onbuild/Dockerfile b/sentry_onbuild/Dockerfile
index 9bdb9ea..6424460 100644
--- a/sentry_onbuild/Dockerfile
+++ b/sentry_onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM sentry:8.10
+FROM sentry:8.11
 
 WORKDIR /usr/src/sentry
 

@yosifkit
Copy link
Member

yosifkit commented Dec 2, 2016

Build test of #2412; 1e4c9c4 (sentry):

$ bashbrew build sentry:8.10.0
Building bashbrew/cache:4cd2287a8e368987b84c604bd0276a83efd5e68f7903bd3188122efc08bb702b (sentry:8.10.0)
Tagging sentry:8.10.0
Tagging sentry:8.10

$ 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:37574964127d8a9a94d0a42cffa0d9c740c39c75ecbbd10ad14a3691b9f6d465 (sentry:8.10.0-onbuild)
Tagging sentry:8.10.0-onbuild
Tagging sentry:8.10-onbuild

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


$ bashbrew build sentry:8.11.0
Building bashbrew/cache:28c6604cb0adac278c6463ee8e32863b4a8c3d8e67ccc0ee9445cad95f9ba671 (sentry:8.11.0)
Tagging sentry:8.11.0
Tagging sentry:8.11
Tagging sentry:8
Tagging sentry:latest

$ test/run.sh sentry:8.11.0
testing sentry:8.11.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.11.0-onbuild
Building bashbrew/cache:bf26737d63422ae9a1546d347f19384b9a71f5b9b92e8c8c2b2adbf8435b2952 (sentry:8.11.0-onbuild)
Tagging sentry:8.11.0-onbuild
Tagging sentry:8.11-onbuild
Tagging sentry:8-onbuild
Tagging sentry:onbuild

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

@yosifkit yosifkit merged commit 2c2629a into docker-library:master Dec 2, 2016
@mattrobenolt mattrobenolt deleted the sentry branch December 3, 2016 03:48
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