From c98556880f6495a30cef107da5dac591eaf875c5 Mon Sep 17 00:00:00 2001
From: Kebert Xela <kebertxela86@gmail.com>
Date: Tue, 30 Apr 2019 10:39:43 -0700
Subject: [PATCH 1/3] Added docker-compose example

---
 readme.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/readme.md b/readme.md
index 2f59cf7..e609c25 100644
--- a/readme.md
+++ b/readme.md
@@ -63,3 +63,21 @@ docker build -t gossa -f download .
 # run
 sudo docker run -v ~/LocalDirToShare:/shared -p 8001:8001 gossa
 ```
+
+### docker-compose
+```
+version: '2'
+
+services:
+  gossa:
+    image: pldubouilh/gossa:v0.0.6
+    container_name: gossa
+    restart: always
+    ports:
+      - 8001:8001
+    volumes:
+      - gossa:/shared
+
+volumes:
+  gossa: {}
+```

From 916c2605293e791bcfea1917228f5a4e606aedb0 Mon Sep 17 00:00:00 2001
From: Kebert Xela <kebertxela86@gmail.com>
Date: Tue, 30 Apr 2019 10:40:28 -0700
Subject: [PATCH 2/3] Create docker-compose.yml

With Traefik and a few other options
---
 docker-compose.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..bbe835a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,21 @@
+version: '2'
+
+services:
+  gossa-server:
+#    build: .
+    image: pldubouilh/gossa:v0.0.6
+    container_name: gossa
+    restart: always
+    ports:
+      - 8001:8001
+    volumes:
+#      - '${STORAGE}/gossa:/shared'
+      - gossa-server:/shared
+#    labels:
+#      - "traefik.enable=true"
+#      - "traefik.port=8001"
+#      - "traefik.backend=gossa"
+#      - "traefik.frontend.rule=Host:${GOSSA}.${DOMAIN}"
+
+volumes:
+  gossa-server: {}

From 05fc5716d368e50e4b4e3d2cec561c3edc522b52 Mon Sep 17 00:00:00 2001
From: Pierre Dubouilh <pldubouilh@gmail.com>
Date: Sat, 11 May 2019 12:02:11 +0200
Subject: [PATCH 3/3] readme cleanup

---
 .../docker-compose.yml                        |  9 ++----
 docker/readme.md                              | 15 +++++++---
 readme.md                                     | 30 +++----------------
 3 files changed, 17 insertions(+), 37 deletions(-)
 rename docker-compose.yml => docker/docker-compose.yml (67%)

diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 67%
rename from docker-compose.yml
rename to docker/docker-compose.yml
index bbe835a..9101dbb 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,20 +2,15 @@ version: '2'
 
 services:
   gossa-server:
-#    build: .
-    image: pldubouilh/gossa:v0.0.6
+    image: pldubouilh/gossa
     container_name: gossa
     restart: always
     ports:
       - 8001:8001
     volumes:
-#      - '${STORAGE}/gossa:/shared'
-      - gossa-server:/shared
+      - ~/to-share:/shared
 #    labels:
 #      - "traefik.enable=true"
 #      - "traefik.port=8001"
 #      - "traefik.backend=gossa"
 #      - "traefik.frontend.rule=Host:${GOSSA}.${DOMAIN}"
-
-volumes:
-  gossa-server: {}
diff --git a/docker/readme.md b/docker/readme.md
index 25cb0ed..9681d7d 100644
--- a/docker/readme.md
+++ b/docker/readme.md
@@ -1,8 +1,14 @@
-```sh
-# download latest gossa release
-docker build -t gossa -f download.Dockerfile .
+the master branch is automatically built and pushed to [dockerhub](https://hub.docker.com/r/pldubouilh/gossa) under `pldubouilh/gossa`.
 
-# ... or build gossa within a build container, needs to be ran within the sources, ../ from here
+```sh
+# pull from dockerhub and run
+sudo docker run -v ~/LocalDirToShare:/shared -p 8001:8001 pldubouilh/gossa
+```
+
+if you prefer building the image yourself :
+
+```sh
+# build gossa within a build container, needs to be ran within the sources, ../ from here
 docker build -t gossa -f docker/build.Dockerfile .
 
 # and to run it simply
@@ -20,3 +26,4 @@ docker build -t gossa -f caddy.Dockerfile .
 sudo docker run -v ~/LocalDirToShare:/shared --net=host gossa
 ```
 
+a docker-compose example image is also provided. running docker compose should be straightforward : `docker-compose up .` have a look in `docker-compose.yml` for further configuration.
\ No newline at end of file
diff --git a/readme.md b/readme.md
index e609c25..e96b66c 100644
--- a/readme.md
+++ b/readme.md
@@ -9,7 +9,7 @@ gossa
 
 ### features
   * 🔍 files/directories browser
-  * 📩 drag-and-drop file uploader
+  * 📩 drag-and-drop file/directory uploader
   * 🗺️ files handling - move/rename/delete
   * 📸 picture browser
   * 📽️ video streaming from the browser
@@ -53,31 +53,9 @@ make
 |\<any letter\> | search|
 
 ### using with docker
-multiple dockerfiles are provided in the `docker` folder. to simply get started just have a look below
+a few docker/docker-compose files are provided in the [docker folder](https://github.com/pldubouilh/gossa/tree/master/docker). release images are also pushed to [dockerhub](https://hub.docker.com/r/pldubouilh/gossa), e.g. :
 
 ```sh
-# build
-cd docker
-docker build -t gossa -f download .
-
-# run
-sudo docker run -v ~/LocalDirToShare:/shared -p 8001:8001 gossa
-```
-
-### docker-compose
-```
-version: '2'
-
-services:
-  gossa:
-    image: pldubouilh/gossa:v0.0.6
-    container_name: gossa
-    restart: always
-    ports:
-      - 8001:8001
-    volumes:
-      - gossa:/shared
-
-volumes:
-  gossa: {}
+# pull from dockerhub and run
+sudo docker run -v ~/LocalDirToShare:/shared -p 8001:8001 pldubouilh/gossa
 ```