Revert line which choose DB folder using env. Move Dockerfile to root. Simplify export in entrypoint. Update README

4 files changed, 5 insertions, 31 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 799bb0b..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM node:lts-alpine as build
-
-WORKDIR /server-build
-
-RUN ["apk", "add", "--no-cache", "python", "make", "gcc", "g++", "libc-dev", "sqlite-dev"]
-
-COPY . /server-build
-
-RUN ["npm", "ci", "--production", "--build-from-source", "--sqlite=/usr/local"]
-
-FROM node:lts-alpine
-
-WORKDIR /app
-LABEL maintainer="xthursdayx"
-
-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
-
-COPY docker/entrypoint.sh /entrypoint.sh
-CMD ["/entrypoint.sh"]
\ No newline at end of file
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