From ce823c0467df07941270bdfdcab54a6aa4b61e2b Mon Sep 17 00:00:00 2001 From: Fredrik Baberg Date: Fri, 23 Sep 2022 00:33:25 +0200 Subject: [PATCH] Attempt to update proxy --- 3dprinter-octoprint/Dockerfile | 2 +- 3dprinter-octoprint/build.yaml | 16 +++++------ 3dprinter-octoprint/config.yaml | 2 +- 3dprinter-octoprint/logo.png | Bin 75254 -> 75254 bytes .../rootfs/etc/nginx/templates/ingress.gtpl | 26 ++++++++++-------- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/3dprinter-octoprint/Dockerfile b/3dprinter-octoprint/Dockerfile index 7030e41..d718225 100644 --- a/3dprinter-octoprint/Dockerfile +++ b/3dprinter-octoprint/Dockerfile @@ -1,6 +1,6 @@ ARG BUILD_FROM="ghcr.io/home-assistant/amd64-base-debian:bullseye" FROM ${BUILD_FROM} -ARG OCTOPRINT_VERSION="1.8.1" +ARG OCTOPRINT_VERSION="1.8.3" ENV OCTOPRINT_VERSION=${OCTOPRINT_VERSION} diff --git a/3dprinter-octoprint/build.yaml b/3dprinter-octoprint/build.yaml index 72fafe9..778b554 100644 --- a/3dprinter-octoprint/build.yaml +++ b/3dprinter-octoprint/build.yaml @@ -1,12 +1,12 @@ build_from: - aarch64: ghcr.io/home-assistant/aarch64-base-debian:bullseye - amd64: ghcr.io/home-assistant/amd64-base-debian:bullseye - armhf: ghcr.io/home-assistant/armhf-base-debian:bullseye - armv7: ghcr.io/home-assistant/armv7-base-debian:bullseye - i386: ghcr.io/home-assistant/i386-base-debian:bullseye + aarch64: ghcr.io/home-assistant/aarch64-base-debian:bullseye + amd64: ghcr.io/home-assistant/amd64-base-debian:bullseye + armhf: ghcr.io/home-assistant/armhf-base-debian:bullseye + armv7: ghcr.io/home-assistant/armv7-base-debian:bullseye + i386: ghcr.io/home-assistant/i386-base-debian:bullseye labels: - org.opencontainers.image.title: "Home Assistant Add-on: 3DPrinter-OctoPrint add-on" + org.opencontainers.image.title: "Home Assistant Add-on: 3DPrinter-OctoPrint" org.opencontainers.image.description: "3DPrinter-OctoPrint addon for Home-Assistant." - org.opencontainers.image.source: "https://github.com/fredrikbaberg/home-assistant-addons" + org.opencontainers.image.source: "https://github.com/fredrikbaberg/3dprinter-addons" args: - OCTOPRINT_VERSION: "1.8.1" + OCTOPRINT_VERSION: "1.8.3" diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index 14b2192..8a9fd39 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.7.025" +version: "2022.9.001" 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" diff --git a/3dprinter-octoprint/logo.png b/3dprinter-octoprint/logo.png index 459e1f20b2bf5f7a1e90b7b46a3fce5934b536d0..8b49f7122664b3478f324b56ca1f0e3e81f184df 100644 GIT binary patch delta 72 xcmex%n&sPRmJPRC*i>ZR0?|ar>di5&nN0km3?0a5qGQEopAPKeHr=~s0RYo#7}@{; delta 49 ucmex%n&sPRmJPRCCK@zuj%m$gnmnhMfAZem{D}dan|(S^`8M6VW&r?bZ5N#Y diff --git a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl index 06e7027..c95587d 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl +++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl @@ -4,24 +4,26 @@ server { include /etc/nginx/includes/server_params.conf; include /etc/nginx/includes/proxy_params.conf; - location / { + location {{ .ingress_entry }} { allow 172.30.32.2; deny all; - proxy_set_header X-Forwarded-For 172.30.32.2; - proxy_set_header Origin 172.30.32.2; - proxy_pass http://octoprint/; # make sure to add trailing slash here! - proxy_set_header Host $http_host; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Script-Name {{ .ingress_entry }}; + proxy_set_header Host $http_host; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Script-Name {{ .ingress_entry }}; proxy_http_version 1.1; + client_max_body_size 0; - client_max_body_size 0; + proxy_set_header X-Forwarded-Scheme $scheme; + proxy_set_header X-Forwarded-Proto $scheme; + + # proxy_set_header X-Forwarded-For 172.30.32.2; + # proxy_set_header Origin 172.30.32.2; } location /webcam/ {