Update docker-compose.yaml
All checks were successful
Updates/Joplin/pipeline/head This commit looks good
All checks were successful
Updates/Joplin/pipeline/head This commit looks good
This commit is contained in:
parent
8dc726263b
commit
3dc6b47d16
@ -1,9 +1,12 @@
|
|||||||
|
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/'"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
joplin-server:
|
joplin-server:
|
||||||
image: joplin/server:latest
|
image: joplin/server:latest
|
||||||
container_name: joplin-server
|
container_name: joplin-server
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
|
TZ: America/New York
|
||||||
APP_PORT: 8030
|
APP_PORT: 8030
|
||||||
APP_BASE_URL: https://server.joplin.adamoutler.com
|
APP_BASE_URL: https://server.joplin.adamoutler.com
|
||||||
DB_CLIENT: sqlite3
|
DB_CLIENT: sqlite3
|
||||||
@ -16,21 +19,22 @@ services:
|
|||||||
MAILER_AUTH_PASSWORD: ${GOOGLE_APP_PASSWORD}
|
MAILER_AUTH_PASSWORD: ${GOOGLE_APP_PASSWORD}
|
||||||
MAILER_NOREPLY_NAME: JoplinServer
|
MAILER_NOREPLY_NAME: JoplinServer
|
||||||
MAILER_NOREPLY_EMAIL: adamoutler@gmail.com
|
MAILER_NOREPLY_EMAIL: adamoutler@gmail.com
|
||||||
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'"
|
ORIGINS: *origins
|
||||||
TZ: America/New York
|
|
||||||
ports:
|
ports:
|
||||||
- "8030:8030"
|
- "8030:8030"
|
||||||
volumes:
|
volumes:
|
||||||
- data:/var/lib/joplin
|
- data:/var/lib/joplin
|
||||||
networks:
|
networks:
|
||||||
- joplin-net
|
- joplin-net
|
||||||
|
|
||||||
|
|
||||||
joplin-vieweb:
|
joplin-vieweb:
|
||||||
image: gri38/django-joplin-vieweb:latest
|
image: gri38/django-joplin-vieweb:latest
|
||||||
container_name: joplin-vieweb
|
container_name: joplin-vieweb
|
||||||
depends_on:
|
depends_on:
|
||||||
- joplin-terminal-xapi
|
- joplin-terminal-xapi
|
||||||
environment:
|
environment:
|
||||||
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'"
|
ORIGINS: *origins
|
||||||
CERT_DOMAIN: joplin.adamoutler.com
|
CERT_DOMAIN: joplin.adamoutler.com
|
||||||
TZ: America/New York
|
TZ: America/New York
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -42,23 +46,28 @@ services:
|
|||||||
- vieweb:/root/.config/joplin-vieweb
|
- vieweb:/root/.config/joplin-vieweb
|
||||||
networks:
|
networks:
|
||||||
- joplin-net
|
- joplin-net
|
||||||
|
|
||||||
|
|
||||||
joplin-terminal-xapi:
|
joplin-terminal-xapi:
|
||||||
container_name: joplin-terminal-xapi
|
container_name: joplin-terminal-xapi
|
||||||
image: gri38/joplin-terminal-xapi:latest
|
image: gri38/joplin-terminal-xapi:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
CERT_DOMAIN: joplin.adamoutler.com
|
CERT_DOMAIN: joplin.adamoutler.com
|
||||||
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'"
|
ORIGINS: *origins
|
||||||
TZ: America/New York
|
TZ: America/New York
|
||||||
volumes:
|
volumes:
|
||||||
- apidata:/root/.config/joplin
|
- apidata:/root/.config/joplin
|
||||||
networks:
|
networks:
|
||||||
- joplin-net
|
- joplin-net
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
vieweb:
|
vieweb:
|
||||||
apidata:
|
apidata:
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
joplin-net:
|
joplin-net:
|
||||||
name: joplin-net
|
name: joplin-net
|
Loading…
x
Reference in New Issue
Block a user