Compare commits
15 Commits
klipper_de
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| bf788cbfb3 | |||
| 45e63b8641 | |||
| f6b944d1b0 | |||
| 408de12f3d | |||
| ef0a2ff45e | |||
| 873d3dcb68 | |||
| dfb6855bc5 | |||
|
b25d5a2ea2 | ||
|
|
b778fce29d | ||
|
ebd7be4f18 | ||
|
|
e7ca882cdb | ||
|
|
9e0dd8081b | ||
|
|
5e6b881509 | ||
|
|
24dd16ee55 | ||
|
|
4b8e9a92bc |
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -100,7 +100,7 @@ jobs:
|
||||
|
||||
- name: Login to GitHub Container Registry
|
||||
if: env.BUILD_ARGS != '--test'
|
||||
uses: docker/login-action@v3.0.0
|
||||
uses: docker/login-action@v3.3.0
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
@ -108,7 +108,7 @@ jobs:
|
||||
|
||||
- name: Build ${{ matrix.addon }} add-on
|
||||
if: steps.check.outputs.build_arch == 'true'
|
||||
uses: home-assistant/builder@2024.01.0
|
||||
uses: home-assistant/builder@2024.08.1
|
||||
with:
|
||||
args: |
|
||||
${{ env.BUILD_ARGS }} \
|
||||
|
||||
2
.github/workflows/cleanup-packages.yml
vendored
2
.github/workflows/cleanup-packages.yml
vendored
@ -9,7 +9,7 @@ jobs:
|
||||
name: Cleanup packages
|
||||
steps:
|
||||
- name: Delete RC version of packages
|
||||
uses: smartsquaregmbh/delete-old-packages@v0.7.0
|
||||
uses: smartsquaregmbh/delete-old-packages@v0.8.1
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
user: fredrikbaberg
|
||||
|
||||
2
.github/workflows/lint.yml
vendored
2
.github/workflows/lint.yml
vendored
@ -36,6 +36,6 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: 🚀 Run Home Assistant Add-on Lint
|
||||
uses: frenck/action-addon-linter@v2.15
|
||||
uses: frenck/action-addon-linter@v2.18
|
||||
with:
|
||||
path: "./${{ matrix.path }}"
|
||||
|
||||
@ -34,7 +34,7 @@ jobs:
|
||||
|
||||
- name: Login to GitHub Container Registry
|
||||
if: env.BUILD_ARGS != '--test'
|
||||
uses: docker/login-action@v3.0.0
|
||||
uses: docker/login-action@v3.3.0
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
@ -42,7 +42,7 @@ jobs:
|
||||
|
||||
- name: Build ${{ matrix.addon }} add-on
|
||||
if: steps.check.outputs.build_arch == 'true'
|
||||
uses: home-assistant/builder@2024.01.0
|
||||
uses: home-assistant/builder@2024.08.1
|
||||
with:
|
||||
args: |
|
||||
${{ env.BUILD_ARGS }} \
|
||||
|
||||
@ -34,7 +34,7 @@ jobs:
|
||||
|
||||
- name: Login to GitHub Container Registry
|
||||
if: env.BUILD_ARGS != '--test'
|
||||
uses: docker/login-action@v3.0.0
|
||||
uses: docker/login-action@v3.3.0
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
@ -42,7 +42,7 @@ jobs:
|
||||
|
||||
- name: Build ${{ matrix.addon }} add-on
|
||||
if: steps.check.outputs.build_arch == 'true'
|
||||
uses: home-assistant/builder@2024.01.0
|
||||
uses: home-assistant/builder@2024.08.1
|
||||
with:
|
||||
args: |
|
||||
${{ env.BUILD_ARGS }} \
|
||||
|
||||
@ -34,7 +34,7 @@ jobs:
|
||||
|
||||
- name: Login to GitHub Container Registry
|
||||
if: env.BUILD_ARGS != '--test'
|
||||
uses: docker/login-action@v3.0.0
|
||||
uses: docker/login-action@v3.3.0
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
@ -42,7 +42,7 @@ jobs:
|
||||
|
||||
- name: Build ${{ matrix.addon }} add-on
|
||||
if: steps.check.outputs.build_arch == 'true'
|
||||
uses: home-assistant/builder@2024.01.0
|
||||
uses: home-assistant/builder@2024.08.1
|
||||
with:
|
||||
args: |
|
||||
${{ env.BUILD_ARGS }} \
|
||||
|
||||
@ -34,7 +34,7 @@ jobs:
|
||||
|
||||
- name: Login to GitHub Container Registry
|
||||
if: env.BUILD_ARGS != '--test'
|
||||
uses: docker/login-action@v3.0.0
|
||||
uses: docker/login-action@v3.3.0
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
@ -42,7 +42,7 @@ jobs:
|
||||
|
||||
- name: Build ${{ matrix.addon }} add-on
|
||||
if: steps.check.outputs.build_arch == 'true'
|
||||
uses: home-assistant/builder@2024.01.0
|
||||
uses: home-assistant/builder@2024.08.1
|
||||
with:
|
||||
args: |
|
||||
${{ env.BUILD_ARGS }} \
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
## 2025.11.0
|
||||
* Update debian version to Bookworm
|
||||
* Update default OctoPrint version to 1.11.4
|
||||
|
||||
## 2024.11.0
|
||||
* Remove AppArmor to make it run on HA Supervised
|
||||
* Update default OctoPrint version to 1.10.3
|
||||
|
||||
## 2024.01.2
|
||||
* Add option to pass webcam URL to proxy.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
ARG BUILD_FROM="ghcr.io/home-assistant/amd64-base-debian:bullseye"
|
||||
ARG BUILD_FROM="reg i3omb.com/ha/amd64-base-debian:bookworm"
|
||||
FROM ${BUILD_FROM}
|
||||
ARG OCTOPRINT_VERSION="1.9.3"
|
||||
ARG OCTOPRINT_VERSION="1.11.4"
|
||||
|
||||
# Setup path for persistent install of Python packages
|
||||
ENV PYTHONPATH=/data/python/octoprint
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
#include <tunables/global>
|
||||
|
||||
profile 3dprinter-octoprint flags=(attach_disconnected,mediate_deleted) {
|
||||
#include <abstractions/base>
|
||||
|
||||
# Capabilities
|
||||
file,
|
||||
signal (send) set=(kill,term,int,hup,cont),
|
||||
|
||||
# S6-Overlay
|
||||
/init ix,
|
||||
/bin/** ix,
|
||||
/usr/bin/** ix,
|
||||
/run/{s6,s6-rc*,service}/** ix,
|
||||
/package/** ix,
|
||||
/command/** ix,
|
||||
/etc/services.d/** rwix,
|
||||
/etc/cont-init.d/** rwix,
|
||||
/etc/cont-finish.d/** rwix,
|
||||
/run/{,**} rwk,
|
||||
/dev/tty rw,
|
||||
|
||||
# Bashio
|
||||
/usr/lib/bashio/** ix,
|
||||
/tmp/** rwk,
|
||||
|
||||
# Access to options.json and other files within your addon
|
||||
/data/** rw,
|
||||
|
||||
# Start new profile for service
|
||||
/usr/bin/caddy cx -> caddy,
|
||||
|
||||
profile caddy flags=(attach_disconnected,mediate_deleted) {
|
||||
#include <abstractions/base>
|
||||
|
||||
# Receive signals from S6-Overlay
|
||||
signal (receive) peer=*_3dprinter-octoprint,
|
||||
|
||||
capability dac_override,
|
||||
|
||||
owner /usr/bin/caddy rm,
|
||||
@{HOME}/.step/ w,
|
||||
@{PROC}/*/cpuset r,
|
||||
@{PROC}/sys/net/** r,
|
||||
|
||||
/etc/** r,
|
||||
owner /etc/caddy/ kwr,
|
||||
owner /etc/caddy/** kwrml,
|
||||
|
||||
/var/log/caddy/ r,
|
||||
owner /var/log/caddy/ kwr,
|
||||
owner /var/log/caddy/** kwrml,
|
||||
|
||||
owner /data/config/caddy/ kwr,
|
||||
owner /data/config/caddy/** kwrml,
|
||||
}
|
||||
}
|
||||
@ -1,11 +1,8 @@
|
||||
build_from:
|
||||
aarch64: ghcr.io/home-assistant/aarch64-base-debian:bullseye
|
||||
amd64: ghcr.io/home-assistant/amd64-base-debian:bullseye
|
||||
armhf: ghcr.io/home-assistant/armhf-base-debian:bullseye
|
||||
armv7: ghcr.io/home-assistant/armv7-base-debian:bullseye
|
||||
amd64: reg.i3omb.com/ha/amd64-base-debian:bookworm
|
||||
labels:
|
||||
org.opencontainers.image.title: "Home Assistant Add-on: 3DPrinter-OctoPrint"
|
||||
org.opencontainers.image.description: "3DPrinter-OctoPrint addon for Home-Assistant."
|
||||
org.opencontainers.image.source: "https://github.com/fredrikbaberg/ha-3dprinter-addons"
|
||||
org.opencontainers.image.source: "https://git.i3omb.com/gronod/ha-3dprinter-addons"
|
||||
args:
|
||||
OCTOPRINT_VERSION: "1.9.3"
|
||||
OCTOPRINT_VERSION: "1.11.4"
|
||||
|
||||
@ -1,13 +1,10 @@
|
||||
name: "3DPrinter-OctoPrint"
|
||||
version: "2024.01.2"
|
||||
version: "2025.11.0"
|
||||
slug: "3dprinter-octoprint"
|
||||
description: "OctoPrint as an addon, no additional bells and whistles."
|
||||
arch:
|
||||
- armv7
|
||||
- amd64
|
||||
- armhf
|
||||
- aarch64
|
||||
url: "https://github.com/fredrikbaberg/ha-3dprinter-addons/tree/main/3dprinter-octoprint"
|
||||
url: "https://git.i3omb.com/gronod/ha-3dprinter-addons/tree/main/3dprinter-octoprint"
|
||||
webui: http://[HOST]:[PORT:5000]
|
||||
ports:
|
||||
5000/tcp: null
|
||||
@ -25,7 +22,7 @@ options:
|
||||
schema:
|
||||
trusted_proxies: "str?"
|
||||
camera_url: "str?"
|
||||
image: ghcr.io/fredrikbaberg/ha-addon-3dprinter-octoprint-{arch}
|
||||
image: reg.i3omb.com/ha/3dprinter-octoprint
|
||||
tmpfs: true
|
||||
panel_icon: mdi:printer-3d
|
||||
panel_title: 3DPrinter-OctoPrint
|
||||
|
||||
@ -1,12 +1,15 @@
|
||||
# 3DPrinter-Remote
|
||||
|
||||
Provides remote access to 3DPrinter. Add-on runs ser2net and can be connected to by e.g. socat.
|
||||
Lets you connect a 3D printer to one device and connect to it from a different one running OctoPrint.
|
||||
Add-on runs ser2net and can be connected to by e.g. socat.
|
||||
|
||||
*Note: Performance will be very dependent on network.*
|
||||
|
||||
## Usage
|
||||
|
||||
On the machine connected to the printer (`remote machine`):
|
||||
* Setup the add-on. At minimum you will need to specify `printer_path` and verify that `baud_rate` is correct.
|
||||
|
||||
On the machine with OctoPrint:
|
||||
On the machine with OctoPrint (`host machine`):
|
||||
* Go to Settings --> Serial Connection, section __Additional serial ports__. Add : `socket://<remote machine>:9999`. For example, use the IP for `remote machine`.
|
||||
* Install plugin [OctoPrint-Network-Printing](https://github.com/hellerbarde/OctoPrint-Network-Printing)
|
||||
* Install plugin [OctoPrint-Network-Printing](https://github.com/hellerbarde/OctoPrint-Network-Printing)
|
||||
|
||||
@ -9,7 +9,6 @@ arch:
|
||||
- armhf
|
||||
- aarch64
|
||||
- i386
|
||||
stage: experimental
|
||||
init: false
|
||||
gpio: true
|
||||
usb: true
|
||||
|
||||
@ -11,10 +11,10 @@ Set input arguments through `mjpg_input` configuration option, start the add-on.
|
||||
## Accessing camera from Home Assistant
|
||||
|
||||
The camera stream and snapshot can be accessed by e.g. [MJPEG IP Camera](https://www.home-assistant.io/integrations/mjpeg/), with URLs:
|
||||
* MJPEG URL: `http://<addon-hostname>/?action=stream`
|
||||
* Still image URL: `http://<addon-hostname>/?action=snapshot`.
|
||||
* MJPEG URL: `http://cce6f2d5-camera-mjpg-streamer/?action=stream`
|
||||
* Still image URL: `http://cce6f2d5-camera-mjpg-streamer/?action=snapshot`.
|
||||
|
||||
Addon hostname can be found under [addon settings](https://my.home-assistant.io/redirect/supervisor_addon/?addon=b7aa59c4_camera-mjpg-streamer&repository_url=https%3A%2F%2Fgithub.com%2Ffredrikbaberg%2Fha-3dprinter-addons).
|
||||
Addon hostname can be found under [addon settings](https://my.home-assistant.io/redirect/supervisor_addon/?addon=cce6f2d5_camera-mjpg-streamer&repository_url=https%3A%2F%2Fgithub.com%2Ffredrikbaberg%2Fha-3dprinter-addons).
|
||||
|
||||
## Ingress?
|
||||
|
||||
|
||||
@ -13,7 +13,6 @@ arch:
|
||||
- armhf
|
||||
- aarch64
|
||||
- i386
|
||||
# stage: experimental
|
||||
init: false
|
||||
video: true
|
||||
usb: true
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
name: 3DPrinter addons for Home-Asssistant by fredrikbaberg
|
||||
url: https://github.com/fredrikbaberg/ha-3dprinter-addons
|
||||
maintainer: Fredrik Baberg <fredrik.baberg@gmail.com>
|
||||
name: 3DPrinter addons for Home-Asssistant by gronod
|
||||
url: https://git.i3omb.com/gronod/ha-3dprinter-addon
|
||||
maintainer: Gordon Bolton <gordon@i3omb.com>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user