fix(joplin): add secret, use upstream container
This commit is contained in:
parent
ffabf88216
commit
969c2455c3
2 changed files with 8 additions and 6 deletions
|
@ -16,6 +16,7 @@ HostName=joplin-db
|
||||||
|
|
||||||
Volume=joplindb-data:/var/lib/postgresql/data
|
Volume=joplindb-data:/var/lib/postgresql/data
|
||||||
|
|
||||||
Environment=POSTGRES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
|
||||||
Environment=POSTGRES_USER=postgres
|
Environment=POSTGRES_USER=postgres
|
||||||
Environment=POSTGRES_DB=joplin
|
Environment=POSTGRES_DB=joplin
|
||||||
|
|
||||||
|
Secret=joplin-db-pw,type=env,target=POSTGRES_PASSWORD
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Joplin Server Quadlet
|
Description=Joplin server
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Restart=always
|
Restart=always
|
||||||
|
@ -9,17 +9,18 @@ TimeoutStartSec=900
|
||||||
WantedBy=default.target
|
WantedBy=default.target
|
||||||
|
|
||||||
[Container]
|
[Container]
|
||||||
Image=docker.io/etechonomy/joplin-server:latest
|
Image=docker.io/joplin/server:latest
|
||||||
ContainerName=joplin-server
|
ContainerName=joplin-server
|
||||||
HostName=joplin-server
|
HostName=joplin-server
|
||||||
|
|
||||||
PublishPort=22300:22300
|
PublishPort=22300:22300
|
||||||
|
|
||||||
Environment=APP_BASE_URL=https://xxxxx.xxx
|
Environment=APP_BASE_URL=https://joplin.example.com
|
||||||
Environment=APP_PORT=22300
|
Environment=APP_PORT=22300
|
||||||
Environment=DB_CLIENT=pg
|
Environment=DB_CLIENT=pg
|
||||||
Environment=POSTGRES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
|
||||||
Environment=POSTGRES_DATABASE=joplin
|
Environment=POSTGRES_DATABASE=joplin
|
||||||
Environment=POSTGRES_USER=postgres
|
Environment=POSTGRES_USER=postgres
|
||||||
Environment=POSTGRES_PORT=5432
|
Environment=POSTGRES_PORT=5432
|
||||||
Environment=POSTGRES_HOST=joplin-db
|
Environment=POSTGRES_HOST=joplin-db
|
||||||
|
|
||||||
|
Secret=joplin-db-pw,type=env,target=POSTGRES_PASSWORD
|
||||||
|
|
Loading…
Add table
Reference in a new issue