From 11e026e099dffeb8d4a8ac5793be9f8f268b66b8 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 1 Jul 2021 10:56:12 +0200
Subject: [PATCH] fix docker setup

---
 docs/docker/Dockerfile                  | 4 ++++
 docs/docker/entrypoint.sh               | 4 ++++
 docs/docker/postgres/docker-compose.yml | 3 ++-
 docs/docker/sqlite/docker-compose.yml   | 3 ++-
 docs/install/docker.md                  | 8 ++++----
 5 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100755 docs/docker/entrypoint.sh

diff --git a/docs/docker/Dockerfile b/docs/docker/Dockerfile
index c1c89a34..7ea8472d 100644
--- a/docs/docker/Dockerfile
+++ b/docs/docker/Dockerfile
@@ -1,2 +1,6 @@
 FROM node:buster
 RUN yarn global add --silent https://gancio.org/latest.tgz 2> /dev/null
+
+ADD entrypoint.sh /
+RUN chmod 755 /entrypoint.sh
+ENTRYPOINT [ "/bin/sh", "/entrypoint.sh" ]
diff --git a/docs/docker/entrypoint.sh b/docs/docker/entrypoint.sh
new file mode 100755
index 00000000..7f124b75
--- /dev/null
+++ b/docs/docker/entrypoint.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+chown -R node:node /home/node
+su node -c "$*"
+
diff --git a/docs/docker/postgres/docker-compose.yml b/docs/docker/postgres/docker-compose.yml
index 74b8476e..0414194e 100644
--- a/docs/docker/postgres/docker-compose.yml
+++ b/docs/docker/postgres/docker-compose.yml
@@ -19,12 +19,13 @@ services:
     build: .
     restart: always
     image: node:buster
-    user: node
     container_name: gancio
     environment:
       - PATH=$PATH:/home/node/.yarn/bin
       - GANCIO_DATA=/home/node/data
+      - NODE_ENV=production
     command: gancio start --docker
+    entrypoint: /entrypoint.sh
     volumes:
       - ./data:/home/node/data
     ports:
diff --git a/docs/docker/sqlite/docker-compose.yml b/docs/docker/sqlite/docker-compose.yml
index 478aa72c..e5e3fa18 100644
--- a/docs/docker/sqlite/docker-compose.yml
+++ b/docs/docker/sqlite/docker-compose.yml
@@ -5,11 +5,12 @@ services:
     build: .
     restart: always
     image: node:buster
-    user: node
     container_name: gancio
     environment:
       - PATH=$PATH:/home/node/.yarn/bin
       - GANCIO_DATA=/home/node/data
+      - NODE_ENV=production
+    entrypoint: /entrypoint.sh
     command: gancio start --docker
     volumes:
       - ./data:/home/node/data
diff --git a/docs/install/docker.md b/docs/install/docker.md
index 7e405818..3dd7ecab 100644
--- a/docs/install/docker.md
+++ b/docs/install/docker.md
@@ -13,12 +13,9 @@ nav_order: 2
 
 ## Initial setup
 
-> info "Clone not needed"
-> You do not need to clone the full repo, a `Dockerfile` and a `docker-compose.yml` are enough.
-
 - __Create a directory where everything related to gancio is stored__
 ```bash
-mkdir -p /opt/gancio/data
+mkdir -p /opt/gancio
 cd /opt/gancio
 ```
 
@@ -27,6 +24,7 @@ cd /opt/gancio
 1. **Download docker-compose.yml and Dockerfile**
 ```bash
 wget {{site.url}}{% link /docker/Dockerfile %}
+wget {{site.url}}{% link /docker/entrypoint.sh %}
 wget {{site.url}}{% link /docker/sqlite/docker-compose.yml %}
 ```
 
@@ -44,6 +42,7 @@ docker-compose run --rm gancio gancio setup --docker --db=sqlite
 1. **Download docker-compose.yml and Dockerfile**
 ```bash
 wget {{site.url}}{% link /docker/Dockerfile %}
+wget {{site.url}}{% link /docker/entrypoint.sh %}
 wget {{site.url}}{% link /docker/postgres/docker-compose.yml %}
 ```
 
@@ -86,6 +85,7 @@ tail -f  data/logs/gancio.log
 > 1. `cd /opt/gancio`
 > 1. [Backup your data]({% link install/backup.md %})
 > 1. Download new `Dockerfile` <br/> `wget {{site.url}}{% link /docker/Dockerfile %}`
+> 1. Download new `entrypoint.sh` <br/> `wget {{site.url}}{% link /docker/entrypoint.sh %}`
 > 1. Download new `docker-compose.yml`  (substitute `sqlite` with `postgres` in case):  <br/>`wget {{site.url}}{% link /docker/sqlite/docker-compose.yml %}`
 > 1. Build the new container `docker-compose build`
 > 1. Extract your backup into `./data` <br/>`mkdir data; tar xvzf gancio-<yourLastBackup>-backup.tgz -C data`