gronod/ha-3dprinter-addons
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Attempt to update proxy

Browse Source
This commit is contained in:
Fredrik Baberg 2022-09-23 00:33:25 +02:00
parent c23bd3726b
commit ce823c0467
5 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3dprinter-octoprint/Dockerfile
View File

@ -1,6 +1,6 @@
ARG BUILD_FROM="ghcr.io/home-assistant/amd64-base-debian:bullseye" ARG BUILD_FROM="ghcr.io/home-assistant/amd64-base-debian:bullseye"
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG OCTOPRINT_VERSION="1.8.1" ARG OCTOPRINT_VERSION="1.8.3"
ENV OCTOPRINT_VERSION=${OCTOPRINT_VERSION} ENV OCTOPRINT_VERSION=${OCTOPRINT_VERSION}

16
3dprinter-octoprint/build.yaml
View File

@ -1,12 +1,12 @@
build_from: build_from:
aarch64: ghcr.io/home-assistant/aarch64-base-debian:bullseye aarch64: ghcr.io/home-assistant/aarch64-base-debian:bullseye
amd64: ghcr.io/home-assistant/amd64-base-debian:bullseye amd64: ghcr.io/home-assistant/amd64-base-debian:bullseye
armhf: ghcr.io/home-assistant/armhf-base-debian:bullseye armhf: ghcr.io/home-assistant/armhf-base-debian:bullseye
armv7: ghcr.io/home-assistant/armv7-base-debian:bullseye armv7: ghcr.io/home-assistant/armv7-base-debian:bullseye
i386: ghcr.io/home-assistant/i386-base-debian:bullseye i386: ghcr.io/home-assistant/i386-base-debian:bullseye
labels: 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.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: args:
OCTOPRINT_VERSION: "1.8.1" OCTOPRINT_VERSION: "1.8.3"

2
3dprinter-octoprint/config.yaml
View File

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

BIN
3dprinter-octoprint/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

26
3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl
View File

@ -4,24 +4,26 @@ server {
include /etc/nginx/includes/server_params.conf; include /etc/nginx/includes/server_params.conf;
include /etc/nginx/includes/proxy_params.conf; include /etc/nginx/includes/proxy_params.conf;
location / { location {{ .ingress_entry }} {
allow 172.30.32.2; allow 172.30.32.2;
deny all; 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_pass http://octoprint/; # make sure to add trailing slash here!
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Scheme $scheme; proxy_set_header X-Scheme $scheme;
proxy_set_header X-Script-Name {{ .ingress_entry }}; proxy_set_header X-Script-Name {{ .ingress_entry }};
proxy_http_version 1.1; 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/ { location /webcam/ {