Fix the necessary env vars for building outside of docker

3 files changed, 20 insertions, 28 deletions

diff --git a/.env.example b/.env.example
index 884ab50..a486df9 100644
--- a/.env.example
+++ b/.env.example
@@ -1,38 +1,31 @@
-HOST=127.0.0.1
-PORT=3333
 NODE_ENV=development
-
-APP_NAME=Ferdium-server
 APP_URL=localhost
-
-CACHE_VIEWS=false
-
-APP_KEY=
-
-DATA_DIR=data
-
 DB_CONNECTION=sqlite
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_USER=root
-DB_PASSWORD=
+DB_PASSWORD=password
 DB_DATABASE=ferdium
 DB_SSL=false
-
-PUID=1000
-PGID=1000
-
-HASH_DRIVER=bcrypt
-
-IS_CREATION_ENABLED=true
-IS_DASHBOARD_ENABLED=true
-IS_REGISTRATION_ENABLED=true
-CONNECT_WITH_FRANZ=true
-
 MAIL_CONNECTION=smtp
-SMTP_PORT=2525
 SMTP_HOST=127.0.0.1
+SMTP_PORT=2525
+MAIL_SSL=false
 MAIL_USERNAME=username
 MAIL_PASSWORD=password
 MAIL_SENDER=noreply@ferdium.org
-MAIL_SSL=true
+IS_CREATION_ENABLED=true
+IS_DASHBOARD_ENABLED=true
+IS_REGISTRATION_ENABLED=true
+CONNECT_WITH_FRANZ=false
+DATA_DIR=data
+PUID=1000
+PGID=1000
+
+# These are needed if running outside of Docker
+APP_KEY= # Need to set some value
+HOST=127.0.0.1
+PORT=3333
+
+# These have defaults hard-coded, but are being overridden
+CACHE_VIEWS=false
diff --git a/Dockerfile b/Dockerfile
index 9fba794..a65ccf1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,8 +19,7 @@ LABEL maintainer="ferdium"
 # TODO: Shouldn't we set 'NODE_ENV=production' when running in production mode?
 ENV HOST=0.0.0.0 PORT=3333 DATA_DIR="/data"
 
-RUN apk add --no-cache sqlite-libs curl su-exec
-RUN apk add --no-cache python3 make g++ py3-pip git py3-pip
+RUN apk add --no-cache sqlite-libs curl su-exec python3 make g++ py3-pip git py3-pip
 # The next command is needed for sqlite3 install command executed by node-gyp
 RUN ln -s /usr/bin/python3 /usr/bin/python
 
diff --git a/config/app.js b/config/app.js
index 30e44f0..1951e68 100644
--- a/config/app.js
+++ b/config/app.js
@@ -15,7 +15,7 @@ module.exports = {
   |
   */
 
-  name: Env.get('APP_NAME', 'AdonisJs'),
+  name: Env.get('APP_NAME', 'Ferdium-server'),
 
   /*
   |--------------------------------------------------------------------------