Skip to content

Commit

Permalink
Merge pull request #260 from kuchel77/master
Browse files Browse the repository at this point in the history
Fixes for 1.9 - Babel app not found
  • Loading branch information
LongLiveCHIEF authored Aug 21, 2023
2 parents e24fb42 + fcb07cb commit 0685eba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PYTHON_BASE_IMAGE=3.8-slim-buster
ARG PYTHON_BASE_IMAGE=3.10-slim-bullseye

This comment has been minimized.

Copy link
@skorokithakis

skorokithakis Aug 25, 2023

This breaks all installed plugins, they all need to be reinstalled. This is a bit of a surprise for a minor release.

This comment has been minimized.

Copy link
@oerkel47

oerkel47 Sep 5, 2023

hotfix: renaming data/octoprint/plugins/lib/python3.8 to data/octoprint/plugins/lib/python3.10


FROM ubuntu AS s6build
ARG S6_RELEASE
Expand Down
8 changes: 4 additions & 4 deletions root/etc/haproxy/haproxy.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ defaults
option forwardfor
maxconn 2000
timeout connect 5s
timeout client 15min
timeout server 15min
timeout client 15m
timeout server 15m

frontend public
bind *:80
use_backend webcam if { path_beg /webcam/ }
default_backend octoprint

backend octoprint
reqrep ^([^\ :]*)\ /(.*) \1\ /\2
http-request replace-path /(.*) /\1
option forwardfor
server octoprint1 127.0.0.1:5000

backend webcam
reqrep ^([^\ :]*)\ /webcam/(.*) \1\ /\2
http-request replace-path /webcam/(.*) /\1
server webcam1 127.0.0.1:8080

0 comments on commit 0685eba

Please sign in to comment.