2024.01 (#91)

.devcontainer/devcontainer.json

@@ -1,14 +1,26 @@
 {
   "name": "Example devcontainer for add-on repositories",
   "image": "ghcr.io/home-assistant/devcontainer:addons",
-  "appPort": ["7123:8123", "7357:4357"],
+  "appPort": [
+    "7123:8123",
+    "7357:4357"
+  ],
   "postStartCommand": "bash devcontainer_bootstrap",
-  "runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"],
+  "runArgs": [
+    "-e",
+    "GIT_EDITOR=code --wait",
+    "--privileged"
+  ],
   "containerEnv": {
     "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
   },
-  "extensions": ["timonwong.shellcheck", "esbenp.prettier-vscode"],
+  "extensions": [
-  "mounts": [ "type=volume,target=/var/lib/docker" ],
+    "timonwong.shellcheck",
+    "esbenp.prettier-vscode"
+  ],
+  "mounts": [
+    "type=volume,target=/var/lib/docker"
+  ],
   "settings": {
     "terminal.integrated.profiles.linux": {
       "zsh": {

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,6 +27,7 @@ body:
       label: Which add-on are you reporting an issue with?
       options:
         - 3DPrinter-OctoPrint
+        - 3DPrinter-Remote
         - Camera-mjpg-streamer
 
   - type: input

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -16,6 +16,7 @@ body:
       options:
         - Other
         - 3DPrinter-OctoPrint
+        - 3DPrinter-Remote
         - Camera-mjpg-streamer
 
   - type: textarea

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 ---
 # yamllint disable rule:line-length rule:truthy
-name: Build add-on
+name: Build add-on(s)
 
 env:
   BUILD_ARGS: "--test"

.github/workflows/manual-build-3dprinter-octoprint.yml

@@ -1,4 +1,4 @@
-name: 3DPrinter-Octoprint manual build
+name: 3DPrinter-Octoprint - manual build
 
 on:
   workflow_dispatch:

.github/workflows/manual-build-3dprinter-remote.yml

@@ -1,4 +1,4 @@
-name: 3DPrinter-Remote manual build
+name: 3DPrinter-Remote - manual build
 
 on:
   workflow_dispatch:

.github/workflows/manual-build-camera-mjpg-streamer.yml

@@ -1,4 +1,4 @@
-name: camera-mjpg-streamer manual build
+name: camera-mjpg-streamer - manual build
 
 on:
   workflow_dispatch:

.github/workflows/manual-build-camera-ustreamer.yml

@@ -1,4 +1,4 @@
-name: camera-ustreamer manual build
+name: camera-ustreamer - manual build
 
 on:
   workflow_dispatch:

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+    "spellright.language": [
+        "en"
+    ],
+    "spellright.documentTypes": [
+        "markdown",
+        "latex",
+        "plaintext"
+    ]
+}

3dprinter-octoprint/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2024.01.1
+
+  * Maintenance release:
+    * Update base image.
+    * Update default OctoPrint version to 1.9.3.
+
 ## 2023.03.1
   * Add check that OctoPrint can install at buildtime.
   * Add missing dependency for armhf (libffi-dev)

3dprinter-octoprint/DOCS.md

@@ -6,7 +6,7 @@ Set a network port in addon settings to be able to access the WebUI.
 
 ## Trusted proxies
 
-By setting trusted proxies you should be able to use HTTPS *if you have placed a reverse proxy in front of Home Assistant*. For more information, see [Caddy documentation](https://caddyserver.com/docs/caddyfile/directives/reverse_proxy).
+*If you have placed a reverse proxy in front of Home Assistant*, by setting trusted proxies you should be able to use HTTPS. For more information, see [Caddy documentation](https://caddyserver.com/docs/caddyfile/directives/reverse_proxy).
 
 # OctoPrint integration
 
@@ -19,22 +19,10 @@ Go to OctoPrint WebUI, you should see a request for authentication.
 
 # Camera
 
-There is no camera server in the addon, it has to be setup separately.
+This addon does not include a camera server, it has to be setup separately. 
 
-You could, for instance, use the addon [camera-mjpg-streamer](https://github.com/fredrikbaberg/3dprinter-addons/tree/main/camera-mjpg-streamer) available in the same repository. If so, you can set the snapshot URL to:
+You could, for instance, use the addon [camera-mjpg-streamer](https://github.com/fredrikbaberg/ha-3dprinter-addons/tree/main/camera-mjpg-streamer) available in the same repository. Note that this method **only allows for snapshot**, it does **NOT** work for camera stream as this requires the browser/app used to directly access the stream.
-> `http://cce6f2d5-camera-mjpg-streamer/?action=snapshot`.
 
-Note that this method **only allows for snapshot**, it does **NOT** work for camera stream as this requires the browser/app used to directly access the stream.
+# Remote access
-
-# Ingress?
-
-This add-on drops support for Ingress. The main reason for this is issues with finding a working configuration.
-
-* An update to OctoPrint increased the security (which is good!). Unfortunately it also broke the configuration used in this addon, most likely due to this addon not behaving properly.
-* There has been issues with accessing camera stream by Ingress since I added support for it, which I have not been able to solve.
-
-I have tried to find a solution to this, without success. Therefore I decided to disable the option, as it just leads to frustration.
-
-If someone is able to find a working configuration, please let me know.
 
 If you need remote access, have a look at [remote access plugins for OctoPrint](https://plugins.octoprint.org/topics/remote_access/). Remember to **NEVER** directly portforward your OctoPrint instance to the internet!

3dprinter-octoprint/Dockerfile

@@ -1,6 +1,6 @@
 ARG BUILD_FROM="ghcr.io/home-assistant/amd64-base-debian:bullseye"
 FROM ${BUILD_FROM}
-ARG OCTOPRINT_VERSION="1.8.6"
+ARG OCTOPRINT_VERSION="1.9.3"
 
 # Setup path for persistent install of Python packages
 ENV PYTHONPATH=/data/python/octoprint

3dprinter-octoprint/README.md

@@ -2,8 +2,6 @@
 
 Provides OctoPrint as an addon to Home Assistant.
 
-Note: Ingress is **NOT** supported.
-
 ## Instructions
 
 Set a network port in addon settings.

3dprinter-octoprint/build.yaml

@@ -8,4 +8,4 @@ labels:
   org.opencontainers.image.description: "3DPrinter-OctoPrint addon for Home-Assistant."
   org.opencontainers.image.source: "https://github.com/fredrikbaberg/ha-3dprinter-addons"
 args:
-  OCTOPRINT_VERSION: "1.8.7"
+  OCTOPRINT_VERSION: "1.9.3"

3dprinter-octoprint/config.yaml

@@ -1,5 +1,5 @@
 name: "3DPrinter-OctoPrint"
-version: "2023.03.1"
+version: "2024.01.1"
 slug: "3dprinter-octoprint"
 description: "OctoPrint as an addon, no additional bells and whistles."
 arch:

3dprinter-remote/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 2024.01.0
+
+  * Maintenance release

3dprinter-remote/config.yaml

@@ -1,5 +1,5 @@
 name: "3DPrinter-Remote"
-version: "2023.03.0"
+version: "2024.01.0"
 slug: "3dprinter-remote"
 description: "Add-on for accessing 3DPrinter remotely using socat"
 url: "https://github.com/fredrikbaberg/ha-3dprinter-addons/tree/main/3dprinter-remote"

camera-mjpg-streamer/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 2024.01.0
+
+  * Maintenance release

camera-mjpg-streamer/config.yaml

@@ -1,5 +1,5 @@
 name: "Camera-mjpg-streamer"
-version: "2022.7.0"
+version: "2024.01.0"
 slug: "camera-mjpg-streamer"
 description: "Camera streaming addon for Home Assistant, based on mjpg-streamer."
 url: "https://github.com/fredrikbaberg/ha-3dprinter-addons/tree/main/camera-mjpg-streamer"