diff --git a/Dockerfile b/Dockerfile index 3b71849..8b7e293 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,6 +56,7 @@ RUN curl -fsSLO --compressed --retry 3 --retry-delay 10 \ WORKDIR /opt/octoprint RUN pip install . +RUN mkdir -p /octoprint/octoprint /octoprint/plugins # Install mjpg-streamer RUN curl -fsSLO --compressed --retry 3 --retry-delay 10 \ @@ -63,6 +64,7 @@ RUN curl -fsSLO --compressed --retry 3 --retry-delay 10 \ && mkdir /mjpg \ && tar xzf master.tar.gz -C /mjpg + WORKDIR /mjpg/mjpg-streamer-master/mjpg-streamer-experimental RUN make RUN make install diff --git a/root/etc/services.d/octoprint/run b/root/etc/services.d/octoprint/run index f5d6de4..fb4f5dd 100644 --- a/root/etc/services.d/octoprint/run +++ b/root/etc/services.d/octoprint/run @@ -1,3 +1,3 @@ #!/usr/bin/with-contenv sh -exec octoprint serve --iknowwhatimdoing --host 0.0.0.0 --basedir /octoprint +exec octoprint serve --iknowwhatimdoing --host 0.0.0.0 --basedir /octoprint/octoprint diff --git a/root/octoprint/config.yaml b/root/octoprint/octoprint/config.yaml similarity index 86% rename from root/octoprint/config.yaml rename to root/octoprint/octoprint/config.yaml index 381015b..99eb96c 100644 --- a/root/octoprint/config.yaml +++ b/root/octoprint/octoprint/config.yaml @@ -5,6 +5,3 @@ webcam: ffmpeg: /usr/bin/ffmpeg snapshot: http://localhost:8080/?action=snapshot stream: /webcam/?action=stream -plugins: - _disabled: - - backup