6 files changed, 7 insertions, 45 deletions

diff --git a/docker/Dockerfile b/Dockerfile
index 799bb0b..416c503 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,6 @@ ENV HOST=0.0.0.0 PORT=3333
 RUN ["apk", "add", "--no-cache", "sqlite-libs", "curl"]
 
 COPY --from=build /server-build /app
-RUN ["touch", ".env"]
 RUN ["npm", "i", "-g", "@adonisjs/cli"]
 
 HEALTHCHECK --interval=5m --timeout=3s CMD curl -sSf http://localhost:${PORT}/health
diff --git a/README.md b/README.md
index 9d1b02d..60de4fc 100644
--- a/README.md
+++ b/README.md
@@ -78,45 +78,7 @@ After setting up the docker container we recommend you to set up an NGINX revers
             getferdi/ferdi-server           
     ```
 
-    Alternatively, you can also use docker-compose v2 schemas
-
-    ```sh
-    ---
-    version: "2"
-    services:
-    ferdi-server:
-        image: getferdi/ferdi-server
-        container_name: ferdi-server
-        environment:
-        - NODE_ENV=development
-        - EXTERNAL_DOMAIN=<ferdi-serverdomain>   
-        - DB_CONNECTION=<database>
-        - DB_HOST=<yourdbhost>
-        - DB_PORT=<yourdbPORT>
-        - DB_USER=<yourdbuser>
-        - DB_PASSWORD=<yourdbpass>
-        - DB_DATABASE=<yourdbdatabase>
-        - DB_SSL=true/false
-        - MAIL_CONNECTION=<mailsender>
-        - SMPT_HOST=<smtpmailserver>
-        - SMTP_PORT=<smtpport>
-        - MAIL_SSL=true/false
-        - MAIL_USERNAME=<yourmailusername>
-        - MAIL_PASSWORD=<yourmailpassword>
-        - MAIL_SENDER=<sendemailaddress>
-        - IS_CREATION_ENABLED=true/false
-        - IS_DASHBOARD_ENABLED=true/false
-        - IS_REGISTRATION_ENABLED=true/false
-        - CONNECT_WITH_FRANZ=true/false
-        volumes:
-        - <path to data>:/config
-        - <path to database>:/app/database
-        - <path to recipes>:/app/recipes
-        ports:
-        - <port>:80
-        restart: unless-stopped
-    ```
-   You can also use sample [./docker/docker-compose.yml](https://github.com/getferdi/server/tree/master/docker/docker-compose.yml) file.
+    Alternatively, you can also use docker-compose v2 schemas. An example can be found in [./docker/docker-compose.yml](https://github.com/getferdi/server/tree/master/docker/docker-compose.yml) file.
 
 3. Optionally, you can now [set up Nginx as a reverse proxy](https://www.digitalocean.com/community/tutorials/how-to-set-up-a-node-js-application-for-production-on-ubuntu-16-04#set-up-nginx-as-a-reverse-proxy-server).
 
diff --git a/config/database.js b/config/database.js
index 6e08035..b7f57ad 100644
--- a/config/database.js
+++ b/config/database.js
@@ -31,7 +31,7 @@ module.exports = {
   sqlite: {
     client: 'sqlite3',
     connection: {
-      filename: `${Env.get('DATA_DIR', 'database')}/${Env.get('DB_DATABASE', 'development')}.sqlite`,
+      filename: Helpers.appRoot(`${Env.get('DATA_DIR', 'database')}/${Env.get('DB_DATABASE', 'development')}.sqlite`),
     },
     useNullAsDefault: true,
     debug: Env.get('DB_DEBUG', false),
diff --git a/docker/README.md b/docker/README.md
index 5daa9fc..995ca8a 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -101,6 +101,7 @@ After the first run, Ferdi-server's configuration is saved inside the `config.tx
 | `-e IS_DASHBOARD_ENABLED=true` | for specifying whether to enable the Ferdi-server dashboard, default is true |
 | `-e IS_REGISTRATION_ENABLED=true` | for specifying whether to allow user registration, default is true |
 | `-e CONNECT_WITH_FRANZ=true` | for specifying whether to enable connections to the Franz server, default is true |
+| `-e DATA_DIR=database` | for specifying sql-lite database folder, default is database |
 | `-v <path to data>:/config` | this will store persistent ENV  data on the docker host |
 | `-v <path to database>:/app/database` | this will strore Ferdi-server's database on the docker host for persistence |
 | `-v <path to recipes>:/app/recipes` | this will strore Ferdi-server's recipes on the docker host for persistence |
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 364f9c3..8a8c795 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -24,10 +24,10 @@ services:
       - IS_DASHBOARD_ENABLED=true
       - IS_REGISTRATION_ENABLED=true
       - CONNECT_WITH_FRANZ=false
-      - DATA_DIR=/database
+      - DATA_DIR=my-database
     volumes:
       - ferdi-config-vol:/config
-      - ferdi-database-vol:/database
+      - ferdi-database-vol:/app/my-database
       - ferdi-recipes-vol:/app/recipes
     ports:
       - 3333:3333
@@ -35,4 +35,4 @@ services:
 volumes:
   ferdi-config-vol:
   ferdi-database-vol:
-  ferdi-recipes-vol:
\ No newline at end of file
+  ferdi-recipes-vol:
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index cb0dd0f..667196e 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -33,7 +33,7 @@ elif [ -f "/config/FERDI_APP_KEY.txt" ];
         echo "**** App Key set to $APP_KEY you can modify FERDI_APP_KEY.txt to update your key ****"
 fi
 
-export APP_KEY=$APP_KEY
+export APP_KEY
 
 node ace migration:run --force