Update docker-compose.yaml

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
+    image: gri38/django-joplin-vieweb:latest
-    ports:
+    depends_on:
-      - "8088:8000" # Or your preferred host port
+      - joplin-terminal-xapi
     environment:
-      # *** Points to your Joplin Server instance ***
+       <<: *common-variables
-      - JOPLIN_URL=https://server.joplin adamoutler.com # Use service name if on same Docker network
+    restart: unless-stopped
-      # Or use http://your_server_ip_or_domain:22300 if accessing externally/differently
+    ports:
-
+      - 8088:8000
-      # Optional: Set login credentials if your server requires it
+    volumes:
-      # (Check joplin-vieweb docs for exact env var names if needed)
+      - joplin:/root/.config/joplin:ro
-      # - JOPLIN_USERNAME=your_joplin_user_email
+      - joplin-vieweb:/root/.config/joplin-vieweb
-      # - 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
     networks:
       - joplin-net
   terminal-xapi: