From 9496a040c06b55dbd61aa6ff82e8edc36a7e1729 Mon Sep 17 00:00:00 2001 From: Adam Outler Date: Sun, 30 Mar 2025 19:52:29 +0000 Subject: [PATCH] Update docker-compose.yaml --- docker-compose.yaml | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index c9422e5..ecee9dc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,7 @@ services: + x-common-variables: &common-variables + ORIGINS: "'https://joplin.adamoutler.com','https://server.joplin.adamoutler.com', 'http://192.168.1.115:8083','http://192.168.1.115:8088'" + JOPLIN_LOGIN_REQUIRED: True joplin: image: joplin/server:latest container_name: joplin-server @@ -15,24 +18,17 @@ services: networks: - joplin-net vieweb: - image: gri38/django-joplin-vieweb # Check Docker Hub for the image name/tags - ports: - - "8088:8000" # Or your preferred host port + image: gri38/django-joplin-vieweb:latest + depends_on: + - joplin-terminal-xapi environment: - # *** Points to your Joplin Server instance *** - - JOPLIN_URL=https://server.joplin adamoutler.com # Use service name if on same Docker network - # Or use http://your_server_ip_or_domain:22300 if accessing externally/differently - - # Optional: Set login credentials if your server requires it - # (Check joplin-vieweb docs for exact env var names if needed) - # - JOPLIN_USERNAME=your_joplin_user_email - # - JOPLIN_PASSWORD=your_joplin_user_password - - # Optional: Set vieweb specific port if needed inside container (usually defaults ok) - # - PORT=8088 - - # Optional: Require login to vieweb itself (check docs for JOPLIN_LOGIN_REQUIRED or similar) - # - JOPLIN_LOGIN_REQUIRED=true # or false/unset + <<: *common-variables + restart: unless-stopped + ports: + - 8088:8000 + volumes: + - joplin:/root/.config/joplin:ro + - joplin-vieweb:/root/.config/joplin-vieweb networks: - joplin-net terminal-xapi: