From b53e6525f7a3e1d3460f5c076d64e58661e8c18d Mon Sep 17 00:00:00 2001
From: Romain Fluttaz <romain@botux.fr>
Date: Thu, 25 Oct 2018 22:07:43 +0000
Subject: [PATCH] Upgrade to grav 1.5.3. Add doc to run image with
 docker-compose.

---
 Dockerfile |  4 +--
 README.md  | 76 +++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0eb56f8..704ad35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,8 +73,8 @@ VOLUME /var/www/html
 RUN chown -R www-data:www-data /var/www
 
 # Define Grav version and expected SHA1 signature
-ENV GRAV_VERSION 1.5.1
-ENV GRAV_SHA1 5292b05d304329beefeddffbf9f542916012c221
+ENV GRAV_VERSION 1.5.3
+ENV GRAV_SHA1 2265fd3624278922c009ca2907977d1ccc7a8253
 
 # Install grav
 RUN set -ex; \
diff --git a/README.md b/README.md
index 706e57e..fd70012 100644
--- a/README.md
+++ b/README.md
@@ -2,16 +2,18 @@
 
 _[Based on official grav docker image](https://github.com/getgrav/docker-grav)_
 
+**Grav version : 1.5.3**
+
 Fonctionnalities :
 
-* apache-2.4.8
-* GD library
-* Unzip library
-* php7.2
-* php7.2-opcache
-* php7.2-acpu
-* php7.2-yaml
-* php7.2-ldap
+  * apache-2.4.8
+  * GD library
+  * Unzip library
+  * php7.2
+  * php7.2-opcache
+  * php7.2-acpu
+  * php7.2-yaml
+  * php7.2-ldap
 
 ## Building the image from Dockerfile
 
@@ -19,12 +21,62 @@ Fonctionnalities :
 docker build -t grav:latest .
 ```
 
-## Running Grav Image with Latest Grav + Admin (not persistent):
+## Running
 
-```
-docker run -p 8000:80 grav:latest
-```
+You can find 2 version of this image, one on [gitlab botux-fr/docker/grav](https://gitlab.com/botux-fr/docker/grav) _with the CI tools_, the other on docker-hub, link to the [github repository boTux-fr/docker-grav](https://github.com/boTux-fr/docker-grav).
+
+  * Latest botux-grav image on gitlab : [Grav images @ gitlab](https://gitlab.com/botux-fr/docker/grav/container_registry).
+  * Other version on hub.docker : [Grav images @ docker hub](https://hub.docker.com/r/botux/grav/)
+
+### Running Grav Image with Latest Grav + Admin (not persistent):
+
+    docker run -p 8000:80 registry.gitlab.com/botux-fr/docker/grav:latest
 
 Point browser to `http://localhost/8000` and create user account...
 
+### With docker-compose : 
 
+```yaml
+version: "3.6"
+
+services:
+  grav:
+    image: registry.gitlab.com/botux-fr/docker/grav:latest
+    restart: always
+    ports:
+      - 8080:80
+    volumes:
+      - ./data/:/var/www/html/
+```
+_And go on http://localhost:8080/_
+
+--------------------
+#### docker-compose and a reverse proxy like traefik
+
+If you're using traefik as reverse proxy, you can use : 
+
+```yaml
+version: "3.6"
+
+networks:
+  reverse-proxy:
+    name: reverse-proxy
+    external: true
+
+services:
+  grav:
+    image: registry.gitlab.com/botux-fr/docker/grav:latest
+    restart: always
+    networks:
+      - reverse-proxy
+    labels:
+      - "traefik.docker.network=reverse-proxy"
+      - "traefik.enable=true"
+      - "traefik.port=80"
+      - "traefik.backend=grav"
+      - "traefik.frontend.passHostHeader=true"
+      - "traefik.frontend.rule=Host:${DOMAIN:-my.domain.tld}"
+      - "traefik.frontend.whiteList.sourceRange=${WHITELIST:-}"
+    volumes:
+      - ./data/:/var/www/html/
+```
\ No newline at end of file