From 600caebf794b3bd20ba6404388f4c7de83e59240 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Fri, 4 Jun 2021 12:49:49 +0200
Subject: [PATCH] new docker setup (run as user, install from site not npm)

---
 docs/docker/Dockerfile                  |  5 ++---
 docs/docker/postgres/docker-compose.yml | 19 ++++++++++---------
 docs/docker/sqlite/docker-compose.yml   | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/docker/Dockerfile b/docs/docker/Dockerfile
index 4328e84d..c1c89a34 100644
--- a/docs/docker/Dockerfile
+++ b/docs/docker/Dockerfile
@@ -1,3 +1,2 @@
-FROM node:latest
-WORKDIR /
-RUN yarn global add gancio
\ No newline at end of file
+FROM node:buster
+RUN yarn global add --silent https://gancio.org/latest.tgz 2> /dev/null
diff --git a/docs/docker/postgres/docker-compose.yml b/docs/docker/postgres/docker-compose.yml
index 664bd894..74b8476e 100644
--- a/docs/docker/postgres/docker-compose.yml
+++ b/docs/docker/postgres/docker-compose.yml
@@ -17,16 +17,17 @@ services:
         - 5432:5432
   gancio:
     build: .
-    image: node:latest
-    environment:
-      - DEBUG=*,-babel,-follow-redirects,-send,-body-parser:*,-express:*,-connect:*,-sequelize:*
-    container_name: gancio
     restart: always
-    command: gancio start --docker --db=postgres
+    image: node:buster
+    user: node
+    container_name: gancio
+    environment:
+      - PATH=$PATH:/home/node/.yarn/bin
+      - GANCIO_DATA=/home/node/data
+    command: gancio start --docker
     volumes:
-      - ./config.json:/opt/gancio/config.json
-      - ./uploads:/opt/gancio/uploads
+      - ./data:/home/node/data
+    ports:
+      - "127.0.0.1:13120:13120"
     depends_on:
         - db
-    ports:
-      - 127.0.0.1:13120:13120
diff --git a/docs/docker/sqlite/docker-compose.yml b/docs/docker/sqlite/docker-compose.yml
index 8e0ec36e..478aa72c 100644
--- a/docs/docker/sqlite/docker-compose.yml
+++ b/docs/docker/sqlite/docker-compose.yml
@@ -4,14 +4,14 @@ services:
   gancio:
     build: .
     restart: always
-    image: node:latest
+    image: node:buster
+    user: node
     container_name: gancio
-    command: gancio start --docker --db=sqlite
     environment:
-      - DEBUG=*,-babel,-follow-redirects,-send,-body-parser:*,-express:*,-connect:*,-sequelize:*
+      - PATH=$PATH:/home/node/.yarn/bin
+      - GANCIO_DATA=/home/node/data
+    command: gancio start --docker
     volumes:
-      - ./db.sqlite:/opt/gancio/db.sqlite
-      - ./config.json:/opt/gancio/config.json
-      - ./uploads:/opt/gancio/uploads
+      - ./data:/home/node/data
     ports:
       - "127.0.0.1:13120:13120"