Update docker-compose.yaml
Some checks failed
Updates/Joplin/pipeline/head There was a failure building this commit
Some checks failed
Updates/Joplin/pipeline/head There was a failure building this commit
This commit is contained in:
parent
21bc9cd133
commit
8e0751f4fc
@ -1,4 +1,3 @@
|
|||||||
x-origins: &origins "https://joplin.adamoutler.com, https://server.joplin.adamoutler.com, http://192.168.1.115:8083, http://192.168.1.115:8088, http://192.168.1.115:8089, https://adamoutler.github.io, https://joplin.github.io"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
joplin-server:
|
joplin-server:
|
||||||
@ -48,8 +47,6 @@ services:
|
|||||||
MAILER_AUTH_PASSWORD: ${GMAIL_APP_PASSWORD}
|
MAILER_AUTH_PASSWORD: ${GMAIL_APP_PASSWORD}
|
||||||
MAILER_NOREPLY_NAME: JoplinServer
|
MAILER_NOREPLY_NAME: JoplinServer
|
||||||
MAILER_NOREPLY_EMAIL: ${GMAIL_EMAIL}
|
MAILER_NOREPLY_EMAIL: ${GMAIL_EMAIL}
|
||||||
ORIGINS: "https://joplin.adamoutler.com"
|
|
||||||
|
|
||||||
ports:
|
ports:
|
||||||
- "8030:8030"
|
- "8030:8030"
|
||||||
volumes:
|
volumes:
|
||||||
@ -73,41 +70,17 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- joplin-net
|
- joplin-net
|
||||||
|
|
||||||
|
joplin-webapp:
|
||||||
joplin-vieweb:
|
container_name: joplin-webapp
|
||||||
image: gri38/django-joplin-vieweb:latest
|
image: ghcr.io/adamoutler/web-app:latest
|
||||||
container_name: joplin-vieweb
|
|
||||||
depends_on:
|
|
||||||
- joplin-terminal-xapi
|
|
||||||
environment:
|
|
||||||
ORIGINS: *origins
|
|
||||||
CERT_DOMAIN: joplin.adamoutler.com
|
|
||||||
TZ: America/New York
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
ports:
|
||||||
- 8088:8000
|
- "7880:80"
|
||||||
- 8089:8001
|
|
||||||
volumes:
|
|
||||||
- apidata:/root/.config/joplin:ro
|
|
||||||
- vieweb:/root/.config/joplin-vieweb
|
|
||||||
networks:
|
|
||||||
- joplin-net
|
|
||||||
|
|
||||||
|
|
||||||
joplin-terminal-xapi:
|
|
||||||
container_name: joplin-terminal-xapi
|
|
||||||
image: gri38/joplin-terminal-xapi:latest
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- apidata:/root/.config/joplin
|
|
||||||
networks:
|
networks:
|
||||||
- joplin-net
|
- joplin-net
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
vieweb:
|
|
||||||
apidata:
|
|
||||||
database:
|
database:
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user