Add script which will use config.txt if exist

3 files changed, 18 insertions, 4 deletions

diff --git a/.env.example b/.env.example
index d507d6c..b11a2cc 100644
--- a/.env.example
+++ b/.env.example
@@ -10,7 +10,7 @@ CACHE_VIEWS=false
 
 APP_KEY=
 
-DATA_DIR=data
+DATA_DIR=database
 
 DB_CONNECTION=sqlite
 DB_HOST=127.0.0.1
diff --git a/docker/README.md b/docker/README.md
index 995ca8a..2708714 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -76,11 +76,12 @@ The server will be launched at [http://localhost:3333/](http://localhost:3333/)
 ## Configuration
 
 Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 3333:80` would expose port `80` from inside the container to be accessible from the host's IP on port `3333` outside the container. 
-After the first run, Ferdi-server's configuration is saved inside the `config.txt` file inside your persistent data directory (`/config` in the container).
+After the first run, Ferdi-server's default configuration is saved inside the `config.txt` file inside your persistent data directory (`/config` in the container).
+If any environmental parameter is not passed to the container, its value will be taken from the `config.txt` file. You can also edit the `config.txt` file, but it is advisable to send the environment parameters to the container.
 
 | Parameter | Function |
 | :----: | --- |
-| `-p <port>:80` | will map the container's port 80 to a port on the host, default is 3333 |
+| `-p <port>:3333` | will map the container's port 80 to a port on the host, default is 3333 |
 | `-e NODE_ENV=development` | for specifying Node environment, production or development, default is development |
 | `-e EXTERNAL_DOMAIN=<ferdi-serverdomain>` | for specifying external domain address of the ferdi server |
 | `-e DB_CONNECTION=sqlite` | for specifying the database being used, default is sqlite |
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 667196e..0bbcb9d 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -14,13 +14,26 @@ Support our Open Collective at:
 https://opencollective.com/getferdi/
 EOL
 
+# if config.txt doesn't exist then create one with default values
+if [ ! -f /config/config.txt ]; then    
+        cp /app/.env.example /config/config.txt
+fi
+
+# use config.txt default values as .env file    
+if [ -f /app/.env ]; then       
+        rm /app/.env    
+        ln -s /config/config.txt /app/.env      
+elif [ ! -f /app/.env ]; then   
+        ln -s /config/config.txt /app/.env      
+fi
+
 # Create APP key if needed
 if [ ! -f "/config/FERDI_APP_KEY.txt" ];
         then
         echo " "
         echo "**** Generating Ferdi-server app key for first run ****"
         adonis key:generate
-        source .env
+        APP_KEY=$(grep APP_KEY .env | cut -d '=' -f2)
         echo $APP_KEY > /config/FERDI_APP_KEY.txt
         echo "**** App Key set to $APP_KEY you can modify FERDI_APP_KEY.txt to update your key ****"
         sed -i "s/APP_KEY=/APP_KEY=$APP_KEY/g" /config/config.txt