diff --git a/3dprinter-octoprint/Dockerfile b/3dprinter-octoprint/Dockerfile index bb5f260..5b90021 100644 --- a/3dprinter-octoprint/Dockerfile +++ b/3dprinter-octoprint/Dockerfile @@ -7,7 +7,7 @@ ENV OCTOPRINT_VERSION=${OCTOPRINT_VERSION} # Setup path for persistent install of Python packages ENV PYTHONPATH=/data/python/octoprint ENV PYTHONUSERBASE=/data/python/octoprint -ENV PATH=${PATH}:/data/python/octoprint/bin +ENV PATH=/data/python/octoprint/bin:${PATH} # Install dependencies RUN apt update && \ diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index 85ec01f..7545cf9 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.6.010" +version: "2022.6.011" slug: "3dprinter-octoprint" description: "New instance of OctoPrint" url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint" @@ -18,3 +18,4 @@ schema: message: "str?" ports: 5000/tcp: null +ingress: true \ No newline at end of file diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh index 0fa3d9f..924d3a8 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh @@ -4,13 +4,19 @@ # s6-overlay docs: https://github.com/just-containers/s6-overlay # ============================================================================== +whoami + { # Check if OctoPrint is installed + bashio::log.info "Check OctoPrint version..." octoprint --version } || { # Otherwise install { # Check if Python is available + bashio::log.info "Check Python version..." python --version } || { # Otherwise install + bashio::log.info "Install Python..." python3 -m venv /data/python/octoprint - } + } + bashio::log.info "Install OctoPrint..." pip install octoprint==$OCTOPRINT_VERSION } \ No newline at end of file diff --git a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run index 3add3f7..c109b88 100644 --- a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run +++ b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run @@ -5,4 +5,4 @@ # ============================================================================== ## Run your program -exec octoprint serve --iknowwhatimdoing --host 0.0.0.0 --port 5000 --basedir /data/config/octoprint +exec octoprint serve --iknowwhatimdoing --host 0.0.0.0 --port 8099 --basedir /data/config/octoprint diff --git a/repository.yaml b/repository.yaml index c172374..c62f198 100644 --- a/repository.yaml +++ b/repository.yaml @@ -1,3 +1,3 @@ -name: fredrikbaberg Home-Asssistant addons +name: New fredrikbaberg Home-Asssistant addons url: https://github.com/fredrikbaberg/home-assistant-addons maintainer: Fredrik Baberg