Fix all issues found on CR -> especially update README.md, remove creation of new config.txt, update ignore files.

3 files changed, 10 insertions, 26 deletions

diff --git a/docker/.gitignore b/docker/.gitignore
index b726524..552cd4a 100644
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -4,10 +4,6 @@ node_modules
 # Adonis directory for storing tmp files
 tmp
 
-# The development sqlite file
-database/development.sqlite
-database/adonis.sqlite
-
 # Uploaded recipes
 recipes/
 
diff --git a/docker/README.md b/docker/README.md
index 8518e15..1cea8ae 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -76,9 +76,11 @@ 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 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.
+Container images are configured using parameters passed at runtime (such as those above). 
+
+**Warning ,using `config.txt` will be deprecated in the future releases.** 
+
+If any of environmental parameters is not passed to the container, its value will be taken from the `/config/config.txt` file. **The previous functionality of saving container parameters in this file is now removed.**
 
 | Parameter | Function |
 | :----: | --- |
@@ -213,13 +215,5 @@ docker build \
   -t getferdi/ferdi-server:latest .
 ```
 
-## Versions
-
-* **05.02.21:** - Repository moved to ferdi-server repository
-* **19.01.21:** - Updated Mail SSL and DB SLL settings
-* **20.09.20:** - Updated SMTP Mailer settings for password reset.
-* **21.06.20:** - Rebase to Alpine 3.11 and added Mailer settings.
-* **25.09.19:** - Initial Release.
-
 ## License
 Ferdi-server-docker and ferdi-server are licensed under the MIT License.
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 0bbcb9d..eac3fc8 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -14,17 +14,11 @@ 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      
+# use config.txt or .env.example parameter values as default if they are not passed to container        
+if [ -f /config/config.txt ]; then
+    cp /config/config.txt /app/.env
+else
+    cp /app/.env.example /app/.env
 fi
 
 # Create APP key if needed