Run update.sh

logstash/README.md

@@ -4,9 +4,9 @@
 -	[`1.5.6-1`, `1.5.6`, `1.5`, `1` (*1.5/Dockerfile*)](https://github.com/docker-library/logstash/blob/1005054d7dbda0a68dffd55540dabd03649d7d9e/1.5/Dockerfile)
 -	[`2.0.0-1`, `2.0.0`, `2.0` (*2.0/Dockerfile*)](https://github.com/docker-library/logstash/blob/33bd21c3d91a54456606ebc950028af554c82aa7/2.0/Dockerfile)
 -	[`2.1.3-1`, `2.1.3`, `2.1` (*2.1/Dockerfile*)](https://github.com/docker-library/logstash/blob/6640b3dc91110c65e30a715a07bfec00d1f32999/2.1/Dockerfile)
--	[`2.2.1-1`, `2.2.1`, `2.2`, `2`, `latest` (*2.2/Dockerfile*)](https://github.com/docker-library/logstash/blob/aa2e1c7fa0d9eb98974d0785db701a51643240c1/2.2/Dockerfile)
+-	[`2.2.2-1`, `2.2.2`, `2.2`, `2`, `latest` (*2.2/Dockerfile*)](https://github.com/docker-library/logstash/blob/242021957eed6d4fa8c6b4ee10bc07e705641e72/2.2/Dockerfile)
 
-[![](https://badge.imagelayers.io/logstash:latest.svg)](https://imagelayers.io/?images=logstash:1.4.5-1-a2bacae,logstash:1.5.6-1,logstash:2.0.0-1,logstash:2.1.3-1,logstash:2.2.1-1)
+[![](https://badge.imagelayers.io/logstash:latest.svg)](https://imagelayers.io/?images=logstash:1.4.5-1-a2bacae,logstash:1.5.6-1,logstash:2.0.0-1,logstash:2.1.3-1,logstash:2.2.2-1)
 
 For more information about this image and its history, please see [the relevant manifest file (`library/logstash`)](https://github.com/docker-library/official-images/blob/master/library/logstash). This image is updated via pull requests to [the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images).
 

sentry/README.md

@@ -30,31 +30,37 @@ Sentry is a realtime event logging and aggregation platform. It specializes in m
 	$ docker run -d --name sentry-redis redis
 	```
 
-2.	Start a Postgres container:
+2.	Start a Postgres container
 
 		```console
 		$ docker run -d --name sentry-postgres -e POSTGRES_PASSWORD=secret -e POSTGRES_USER=sentry postgres
 		```
 
-3.	If this is a new database, you'll need to run `upgrade`
+3.	Generate a new secret key to be shared by all `sentry` containers. This value will then be used as the `SENTRY_SECRET_KEY` environment variable.
+
+		```console
+		$ docker run --rm sentry generate-secret-key
+		```
+
+4.	If this is a new database, you'll need to run `upgrade`
 
 	```console
-	$ docker run -it --rm --link sentry-postgres:postgres --link sentry-redis:redis sentry upgrade
+	$ docker run -it --rm -e SENTRY_SECRET_KEY <secret-key> --link sentry-postgres:postgres --link sentry-redis:redis sentry upgrade
 	```
 
 	**Note: the `-it` is important as the initial upgrade will prompt to create an initial user and will fail without it**
 
-4.	Now start up Sentry server
+5.	Now start up Sentry server
 
 	```console
-	$ docker run -d --name my-sentry --link sentry-redis:redis --link sentry-postgres:postgres sentry
+	$ docker run -d --name my-sentry -e SENTRY_SECRET_KEY <secret-key> --link sentry-redis:redis --link sentry-postgres:postgres sentry
 	```
 
-5.	The default config needs a celery beat and celery workers, start as many workers as you need (each with a unique name)
+6.	The default config needs a celery beat and celery workers, start as many workers as you need (each with a unique name)
 
 	```console
-	$ docker run -d --name sentry-celery-beat --link sentry-postgres:postgres --link sentry-redis:redis sentry celery beat
-	$ docker run -d --name sentry-celery1 --link sentry-postgres:postgres --link sentry-redis:redis sentry celery worker
+	$ docker run -d --name sentry-celery-beat -e SENTRY_SECRET_KEY <secret-key> --link sentry-postgres:postgres --link sentry-redis:redis sentry celery beat
+	$ docker run -d --name sentry-celery1 -e SENTRY_SECRET_KEY <secret-key> --link sentry-postgres:postgres --link sentry-redis:redis sentry celery worker
 	```
 
 ### Port mapping
@@ -66,7 +72,7 @@ If you'd like to be able to access the instance from the host without the contai
 If you did not create a superuser during `upgrade`, use the following to create one:
 
 ```console
-$ docker run -it --rm --link sentry-redis:redis --link sentry-postgres:postgres sentry createuser
+$ docker run -it --rm -e SENTRY_SECRET_KEY <secret-key> --link sentry-redis:redis --link sentry-postgres:postgres sentry createuser
 ```
 
 ## Environment variables
@@ -78,7 +84,7 @@ When you start the `sentry` image, you can adjust the configuration of the Sentr
 A secret key used for cryptographic functions within Sentry. This key should be unique and consistent across all running instances. You can generate a new secret key doing something like:
 
 ```console
-$ docker run --rm -it debian:jessie cat /proc/sys/kernel/random/uuid
+$ docker run --rm sentry generate-secret-key
 ```
 
 ### `SENTRY_POSTGRES_HOST`, `SENTRY_POSTGRES_PORT`, `SENTRY_DB_NAME`, `SENTRY_DB_USER`, `SENTRY_DB_PASSWORD`