Merge branch 'master' into patch-1

Author: djdefi

Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.15.12-alpine
+FROM nginx:1.17.5-alpine
 
 EXPOSE 8000
 CMD ["/sbin/entrypoint.sh"]
@@ -9,7 +9,7 @@ ARG archive_url
 ENV cachet_ver ${cachet_ver:-2.4}
 ENV archive_url ${archive_url:-https://github.com/cachethq/Cachet/archive/${cachet_ver}.tar.gz}
 
-ENV COMPOSER_VERSION 1.6.3
+ENV COMPOSER_VERSION 1.9.0
 
 RUN apk add --no-cache --update \
     postgresql-client \

README.md

@@ -20,7 +20,6 @@ Cachet is a BSD-3-licensed open source project. If you'd like to support future
 
 2. Edit the docker-compose.yml file to specify your [ENV variables](/conf/.env.docker).
 
-__Note:__ You must specify a unique `APP_KEY` including `base64:` prefix generated by `php artisan key:generate` within the container.
 
 3. To build an image containing a specific Cachet release, set the [`cachet_ver` ARG in the docker-compose.yml](/docker-compose.yml)
 
@@ -37,6 +36,20 @@ __Note:__ You must specify a unique `APP_KEY` including `base64:` prefix generat
 
 5. `cachethq/docker`  runs on port 8000 by default. This is exposed on host port 80 when using docker-compose.
 
+
+6. Setup the APP_KEY
+
+Whilst the container is up and running, find the name of the Cachet container via `docker ps`.
+
+Run `docker exec -i ID_OF_THE_CONTAINER php artisan key:generate`.
+
+Replace `${APP_KEY:-null}` in `docker-compose.yml` with the newly generated Application key.
+
+__Note:__ make sure you include `base64:` prefix. E.g. `base64:YOUR_UNIQUE_KEY`
+
+Restart the Docker containers.
+
+
 # Docker Hub Automated build
 
 `cachethq/docker` is available as a [Docker Hub Trusted Build](https://hub.docker.com/r/cachethq/docker/).

conf/nginx-site.conf

@@ -1,5 +1,6 @@
 server {
     listen 8000 default; ## Listen for ipv4; this line is default and implied
+    listen [::]:8000 default; ## Listen for ipv6
 
     # Make site accessible from http://localhost/
     server_name localhost;

entrypoint.sh

@@ -104,7 +104,7 @@ initialize_system() {
   CACHE_DRIVER=${CACHE_DRIVER:-apc}
 
   SESSION_DRIVER=${SESSION_DRIVER:-apc}
-  SESSION_DOMAIN=${SESSION_DOMAIN:-apc}
+  SESSION_DOMAIN=${SESSION_DOMAIN:-}
   SESSION_SECURE_COOKIE=${SESSION_SECURE_COOKIE:-}
 
   QUEUE_DRIVER=${QUEUE_DRIVER:-database}