use simplelogin/app:4.6.2-beta instead of simplelogin/app:3.4.0. Use alembic instead of flask sqlalchemy

This commit is contained in:
Son 2022-06-15 17:15:21 +02:00
parent 3021d831f1
commit c184a0054d
2 changed files with 13 additions and 13 deletions

View File

@ -426,7 +426,7 @@ docker run --rm \
-v $(pwd)/dkim.pub.key:/dkim.pub.key \
-v $(pwd)/simplelogin.env:/code/.env \
--network="sl-network" \
simplelogin/app:3.4.0 flask db upgrade
simplelogin/app:4.6.2-beta alembic upgrade head
```
This command could take a while to download the `simplelogin/app` docker image.
@ -441,7 +441,7 @@ docker run --rm \
-v $(pwd)/dkim.key:/dkim.key \
-v $(pwd)/dkim.pub.key:/dkim.pub.key \
--network="sl-network" \
simplelogin/app:3.4.0 python init_app.py
simplelogin/app:4.6.2-beta python init_app.py
```
Now, it's time to run the `webapp` container!
@ -457,7 +457,7 @@ docker run -d \
-p 127.0.0.1:7777:7777 \
--restart always \
--network="sl-network" \
simplelogin/app:3.4.0
simplelogin/app:4.6.2-beta
```
Next run the `email handler`
@ -473,7 +473,7 @@ docker run -d \
-p 127.0.0.1:20381:20381 \
--restart always \
--network="sl-network" \
simplelogin/app:3.4.0 python email_handler.py
simplelogin/app:4.6.2-beta python email_handler.py
```
And finally the `job runner`
@ -488,7 +488,7 @@ docker run -d \
-v $(pwd)/dkim.pub.key:/dkim.pub.key \
--restart always \
--network="sl-network" \
simplelogin/app:3.4.0 python job_runner.py
simplelogin/app:4.6.2-beta python job_runner.py
```
### Nginx

View File

@ -7,7 +7,7 @@ Sometimes upgrading to a major version might require running a manual migration.
If you are running versions prior to 3x, please:
1. first upgrade to 2.1.2 then
2. upgrade to the latest version which is 3.4.0
2. upgrade to the latest version which is 4.6.2-beta
<details>
<summary>After upgrade to 3x from 2x</summary>
@ -119,11 +119,11 @@ for user in User.query.all():
</p>
</details>
## Upgrade to the latest version 3.4.0
## Upgrade to the latest version 4.6.2-beta
```bash
# Pull the latest version
sudo docker pull simplelogin/app:3.4.0
sudo docker pull simplelogin/app:4.6.2-beta
# Stop SimpleLogin containers
sudo docker stop sl-email sl-migration sl-app sl-db sl-job-runner
@ -155,7 +155,7 @@ sudo docker run --rm \
-v $(pwd)/dkim.pub.key:/dkim.pub.key \
-v $(pwd)/simplelogin.env:/code/.env \
--network="sl-network" \
simplelogin/app:3.4.0 flask db upgrade
simplelogin/app:4.6.2-beta flask db upgrade
# Run init data
sudo docker run --rm \
@ -166,7 +166,7 @@ sudo docker run --rm \
-v $(pwd)/dkim.key:/dkim.key \
-v $(pwd)/dkim.pub.key:/dkim.pub.key \
--network="sl-network" \
simplelogin/app:3.4.0 python init_app.py
simplelogin/app:4.6.2-beta python init_app.py
# Run the webapp container
sudo docker run -d \
@ -179,7 +179,7 @@ sudo docker run -d \
-p 127.0.0.1:7777:7777 \
--restart always \
--network="sl-network" \
simplelogin/app:3.4.0
simplelogin/app:4.6.2-beta
# Run the email handler container
sudo docker run -d \
@ -192,7 +192,7 @@ sudo docker run -d \
-p 127.0.0.1:20381:20381 \
--restart always \
--network="sl-network" \
simplelogin/app:3.4.0 python email_handler.py
simplelogin/app:4.6.2-beta python email_handler.py
# Run the job runner
docker run -d \
@ -204,7 +204,7 @@ docker run -d \
-v $(pwd)/dkim.pub.key:/dkim.pub.key \
--restart always \
--network="sl-network" \
simplelogin/app:3.4.0 python job_runner.py
simplelogin/app:4.6.2-beta python job_runner.py
```