diff options
| -rw-r--r-- | f3s/minvid/docker-image/Dockerfile | 6 | ||||
| -rw-r--r-- | f3s/minvid/helm-chart/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | frontends/etc/relayd.conf.tpl | 4 | ||||
| -rw-r--r-- | frontends/scripts/acme.sh.tpl | 3 |
4 files changed, 12 insertions, 5 deletions
diff --git a/f3s/minvid/docker-image/Dockerfile b/f3s/minvid/docker-image/Dockerfile index 2967aaa..f453435 100644 --- a/f3s/minvid/docker-image/Dockerfile +++ b/f3s/minvid/docker-image/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /build/MinVid RUN npm install && npm run build # Build API -FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS api-builder +FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS api-builder WORKDIR /build RUN apk add --no-cache git RUN git clone https://github.com/Ludvigaman/MinVid.git . @@ -15,7 +15,7 @@ WORKDIR /build/MinVid-API RUN dotnet publish -c Release -o /app/publish # Final image -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine ENV PUID=1000 ENV PGID=1000 @@ -32,6 +32,8 @@ COPY --from=frontend-builder /build/MinVid/dist ./wwwroot EXPOSE 80 +ENV ASPNETCORE_URLS=http://+:80 + COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh diff --git a/f3s/minvid/helm-chart/templates/deployment.yaml b/f3s/minvid/helm-chart/templates/deployment.yaml index fdc6fe3..6d04977 100644 --- a/f3s/minvid/helm-chart/templates/deployment.yaml +++ b/f3s/minvid/helm-chart/templates/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: minvid - image: r0.lan.buetow.org:30001/minvid:latest + image: registry.lan.buetow.org:30001/minvid:latest imagePullPolicy: Always ports: - containerPort: 80 @@ -39,6 +39,6 @@ spec: - name: web port: 80 protocol: TCP - targetPort: 8000 + targetPort: 80 selector: app: minvid diff --git a/frontends/etc/relayd.conf.tpl b/frontends/etc/relayd.conf.tpl index 5c53df3..8c33dcf 100644 --- a/frontends/etc/relayd.conf.tpl +++ b/frontends/etc/relayd.conf.tpl @@ -65,6 +65,7 @@ http protocol "https" { # For f3s hosts: use relay-level failover (f3s -> localhost backup) # Registry is special: needs explicit routing to port 30001 + # Jellyfin uses NodePorts (bypasses Traefik) <% for my $host (@$f3s_hosts) { for my $prefix (@prefixes) { if ($host eq 'registry.f3s.buetow.org') { @@ -73,6 +74,9 @@ http protocol "https" { <% } elsif ($host eq 'jellyfin.f3s.buetow.org') { -%> match request header "Host" value "<%= $prefix.$host -%>" forward to <f3s_jellyfin> + <% } else { + -%> + match request header "Host" value "<%= $prefix.$host -%>" forward to <f3s> <% } } } -%> diff --git a/frontends/scripts/acme.sh.tpl b/frontends/scripts/acme.sh.tpl index b3301fa..cd6e4cc 100644 --- a/frontends/scripts/acme.sh.tpl +++ b/frontends/scripts/acme.sh.tpl @@ -20,7 +20,8 @@ handle_cert () { host=$1 host_ip=`host $host | awk '/has address/ { print $(NF) }'` - grep -q "^server \"$host\"" /etc/httpd.conf + # Check for server block, accounting for f3s hosts which have -port80/-port8080 suffixes + grep -q "^server \"$host" /etc/httpd.conf if [ $? -ne 0 ]; then echo "Host $host not configured in httpd, skipping..." return |