Update for Caddy

3dprinter-octoprint/Dockerfile

@@ -1,12 +1,8 @@
 ARG BUILD_FROM="ghcr.io/home-assistant/amd64-base-debian:bullseye"
 FROM ${BUILD_FROM}
 ARG OCTOPRINT_VERSION="1.8.2"
-ARG XDG_CONFIG_HOME="/data/config"
-ARG XDG_DATA_HOME="/data/config"
 
 ENV OCTOPRINT_VERSION=${OCTOPRINT_VERSION}
-ENV XDG_CONFIG_HOME=${XDG_CONFIG_HOME}
-ENV XDG_DATA_HOME=${XDG_DATA_HOME}
 
 # Setup path for persistent install of Python packages
 ENV PYTHONPATH=/data/python/octoprint

3dprinter-octoprint/build.yaml

@@ -10,5 +10,3 @@ labels:
   org.opencontainers.image.source: "https://github.com/fredrikbaberg/3dprinter-addons"
 args:
   OCTOPRINT_VERSION: "1.8.4"
-  XDG_CONFIG_HOME: "/data/config"
-  XDG_DATA_HOME: "/data/config"

3dprinter-octoprint/config.yaml

@@ -1,5 +1,5 @@
 name: "3DPrinter-OctoPrint"
-version: "2022.9.025"
+version: "2022.9.026"
 slug: "3dprinter-octoprint"
 description: "OctoPrint as an addon, no additional bells and whistles."
 url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint"

3dprinter-octoprint/rootfs/etc/caddy/env

@@ -0,0 +1,2 @@
+XDG_CONFIG_HOME="/data/caddy"
+XDG_DATA_HOME="/data/caddy"

3dprinter-octoprint/rootfs/etc/services.d/proxy/finish

@@ -3,5 +3,3 @@
 # Add-on: 3dprinter-octoprint
 # Stop reverse proxy
 # ==============================================================================
-
-caddy stop

3dprinter-octoprint/rootfs/etc/services.d/proxy/run

@@ -10,4 +10,4 @@ bashio::net.wait_for 5000
 bashio::log.info "Starting proxy..."
 
 # exec caddy run --config /etc/caddy/Caddyfile
-XDG_CONFIG_HOME=/data/config XDG_DATA_HOME=/data/config caddy start --config /etc/caddy/Caddyfile
+exec caddy run --config /etc/caddy/Caddyfile --envfile /etc/caddy/env

3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml

@@ -11,7 +11,6 @@ folder:
     generated: /tmp/octoprint/generated
     timelapse_tmp: /tmp/octoprint/timelapse/tmp
 server:
-    allowFraming: true
     commands:
         serverRestartCommand: /scripts/octoprint_restart.sh
         systemRestartCommand: /scripts/system_restart.sh