From d9ee631971c1c68dc81b845825c86edc4ffa6032 Mon Sep 17 00:00:00 2001 From: Jan-Henrik Bruhn Date: Mon, 6 Feb 2023 23:23:51 +0100 Subject: [PATCH] Add nginx frontend? --- epaper-station/Dockerfile | 3 ++ epaper-station/config.yaml | 4 ++- epaper-station/rootfs/etc/nginx/nginx.conf | 29 +++++++++++++++++++ .../rootfs/etc/services.d/nginx/run | 4 +++ 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 epaper-station/rootfs/etc/nginx/nginx.conf create mode 100644 epaper-station/rootfs/etc/services.d/nginx/run diff --git a/epaper-station/Dockerfile b/epaper-station/Dockerfile index 67d981b..518264a 100644 --- a/epaper-station/Dockerfile +++ b/epaper-station/Dockerfile @@ -1,12 +1,15 @@ ARG BUILD_FROM=ghcr.io/hassio-addons/base-python/amd64:9.0.1 FROM ${BUILD_FROM} +RUN apk add --no-cache nginx + ADD "https://github.com/jhbruhn/ZBS_Flasher/archive/refs/heads/database_path_config.tar.gz" /src.tar.gz RUN mkdir /src && tar xvfz /src.tar.gz -C /src --strip-components=1 RUN mv /src/CC2531_station/epaper_station_websocket/ /app WORKDIR /app RUN ls /src && pip install -r requirements.txt +RUN mkdir /public && cp /app/online_viewer.html /public/index.html && cp /app/no_img.jpg /public/ ADD rootfs / diff --git a/epaper-station/config.yaml b/epaper-station/config.yaml index 328710f..4db25d6 100644 --- a/epaper-station/config.yaml +++ b/epaper-station/config.yaml @@ -1,10 +1,12 @@ --- name: EPaper Station -version: 1.0.0.7 +version: 1.0.0.8 #image: ghcr.io/maxwinterstein/homeassistant-addon-toogoodtogo-ha-mqtt-bridge-{arch} slug: epaper-station description: Publish Pictures to EPaper pricetags uart: true +ingress: true +ingress_port: 4242 arch: - amd64 - armv7 diff --git a/epaper-station/rootfs/etc/nginx/nginx.conf b/epaper-station/rootfs/etc/nginx/nginx.conf new file mode 100644 index 0000000..56163c3 --- /dev/null +++ b/epaper-station/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,29 @@ +daemon off; + +events { +} + + +http { + include mime.types; + charset utf-8; + + server { + server_name localhost; + listen 0.0.0.0:4242; + + location / { + root /public; + } + + location /ws { + proxy_pass http://localhost:8000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + } + + } + +} diff --git a/epaper-station/rootfs/etc/services.d/nginx/run b/epaper-station/rootfs/etc/services.d/nginx/run new file mode 100644 index 0000000..e81e8cf --- /dev/null +++ b/epaper-station/rootfs/etc/services.d/nginx/run @@ -0,0 +1,4 @@ +#!/bin/bin/with-contenv bashio +bashio::log.info "Starting nginx..." +nginx -g "daemon off;" -c /etc/nginx/nginx.conf +bashio::log.info "nginx running."