Merge pull request #628 from prashantkamdar/master

Binding the docker containers to localhost

README.md

@@ -237,7 +237,7 @@ docker run -d \
     -e POSTGRES_PASSWORD=mypassword \
     -e POSTGRES_USER=myuser \
     -e POSTGRES_DB=simplelogin \
-    -p 5432:5432 \
+    -p 127.0.0.1:5432:5432 \
     -v $(pwd)/sl/db:/var/lib/postgresql/data \
     --restart always \
     --network="sl-network" \
@@ -451,7 +451,7 @@ docker run -d \
     -v $(pwd)/simplelogin.env:/code/.env \
     -v $(pwd)/dkim.key:/dkim.key \
     -v $(pwd)/dkim.pub.key:/dkim.pub.key \
-    -p 7777:7777 \
+    -p 127.0.0.1:7777:7777 \
     --restart always \
     --network="sl-network" \
     simplelogin/app:3.4.0
@@ -467,7 +467,7 @@ docker run -d \
     -v $(pwd)/simplelogin.env:/code/.env \
     -v $(pwd)/dkim.key:/dkim.key \
     -v $(pwd)/dkim.pub.key:/dkim.pub.key \
-    -p 20381:20381 \
+    -p 127.0.0.1:20381:20381 \
     --restart always \
     --network="sl-network" \
     simplelogin/app:3.4.0 python email_handler.py

docs/upgrade.md

@@ -126,14 +126,26 @@ for user in User.query.all():
 sudo docker pull simplelogin/app:3.4.0
 
 # Stop SimpleLogin containers
-sudo docker stop sl-email sl-migration sl-app
+sudo docker stop sl-email sl-migration sl-app sl-db
 
 # Make sure to remove these containers to avoid conflict
-sudo docker rm -f sl-email sl-migration sl-app
+sudo docker rm -f sl-email sl-migration sl-app sl-db
 
 # create ./sl/upload/ if not exist
 mkdir -p ./sl/upload/
 
+# Run the database container. Make sure to replace `myuser` and `mypassword`
+docker run -d \
+    --name sl-db \
+    -e POSTGRES_PASSWORD=mypassword \
+    -e POSTGRES_USER=myuser \
+    -e POSTGRES_DB=simplelogin \
+    -p 127.0.0.1:5432:5432 \
+    -v $(pwd)/sl/db:/var/lib/postgresql/data \
+    --restart always \
+    --network="sl-network" \
+    postgres:12.1
+
 # Run the database migration
 sudo docker run --rm \
     --name sl-migration \
@@ -164,7 +176,7 @@ sudo docker run -d \
     -v $(pwd)/simplelogin.env:/code/.env \
     -v $(pwd)/dkim.key:/dkim.key \
     -v $(pwd)/dkim.pub.key:/dkim.pub.key \
-    -p 7777:7777 \
+    -p 127.0.0.1:7777:7777 \
     --restart always \
     --network="sl-network" \
     simplelogin/app:3.4.0
@@ -177,7 +189,7 @@ sudo docker run -d \
     -v $(pwd)/simplelogin.env:/code/.env \
     -v $(pwd)/dkim.key:/dkim.key \
     -v $(pwd)/dkim.pub.key:/dkim.pub.key \
-    -p 20381:20381 \
+    -p 127.0.0.1:20381:20381 \
     --restart always \
     --network="sl-network" \
     simplelogin/app:3.4.0 python email_handler.py