diff --git a/camera-mjpg-streamer/config.yaml b/camera-mjpg-streamer/config.yaml index 3a3cfbf..acdce6b 100644 --- a/camera-mjpg-streamer/config.yaml +++ b/camera-mjpg-streamer/config.yaml @@ -13,13 +13,14 @@ arch: - armhf - aarch64 - i386 +stage: experimental init: false video: true usb: true ports: - 8000/tcp: null + 80/tcp: null ports_description: - 8000/tcp: Web-based interface (Not required for Ingress) + 80/tcp: Web-based interface (Not required for Ingress) options: mjpg_input: "input_uvc.so -n" schema: diff --git a/camera-rtc/README.md b/camera-rtc/README.md index 3556dfa..c753799 100644 --- a/camera-rtc/README.md +++ b/camera-rtc/README.md @@ -1,3 +1,5 @@ # Camera-RTC +**Note: This addon is not ready for use.** + Camera addon with support for WebRTC. diff --git a/camera-rtc/config.yaml b/camera-rtc/config.yaml index d490eaf..fe619f1 100644 --- a/camera-rtc/config.yaml +++ b/camera-rtc/config.yaml @@ -11,6 +11,7 @@ arch: - amd64 - armhf - armv7 +stage: experimental init: false video: true usb: true diff --git a/3dprinter-octoprint/CHANGELOG.md b/octoprint/CHANGELOG.md similarity index 100% rename from 3dprinter-octoprint/CHANGELOG.md rename to octoprint/CHANGELOG.md diff --git a/3dprinter-octoprint/DOCS.md b/octoprint/DOCS.md similarity index 100% rename from 3dprinter-octoprint/DOCS.md rename to octoprint/DOCS.md diff --git a/3dprinter-octoprint/Dockerfile b/octoprint/Dockerfile similarity index 100% rename from 3dprinter-octoprint/Dockerfile rename to octoprint/Dockerfile diff --git a/3dprinter-octoprint/README.md b/octoprint/README.md similarity index 100% rename from 3dprinter-octoprint/README.md rename to octoprint/README.md diff --git a/3dprinter-octoprint/apparmor.txt b/octoprint/apparmor.txt similarity index 99% rename from 3dprinter-octoprint/apparmor.txt rename to octoprint/apparmor.txt index fb0aa3c..3b37e96 100644 --- a/3dprinter-octoprint/apparmor.txt +++ b/octoprint/apparmor.txt @@ -63,6 +63,9 @@ profile 3dprinter-octoprint flags=(attach_disconnected,mediate_deleted) { # Receive signals from S6-Overlay signal (receive) peer=*_example, + + # Allow capability CAP_CHOWN + capability chown, /usr/sbin/nginx r, /bin/bash rix, @@ -74,8 +77,6 @@ profile 3dprinter-octoprint flags=(attach_disconnected,mediate_deleted) { /var/log/nginx/access.log rw, /var/log/nginx/error.log rw, - - # Allow capability CAP_CHOWN - capability chown, + } } \ No newline at end of file diff --git a/3dprinter-octoprint/build.yaml b/octoprint/build.yaml similarity index 100% rename from 3dprinter-octoprint/build.yaml rename to octoprint/build.yaml diff --git a/3dprinter-octoprint/config.yaml b/octoprint/config.yaml similarity index 81% rename from 3dprinter-octoprint/config.yaml rename to octoprint/config.yaml index b6d8d5f..9653f6f 100644 --- a/3dprinter-octoprint/config.yaml +++ b/octoprint/config.yaml @@ -9,9 +9,11 @@ arch: - armhf - armv7 - i386 +stage: experimental init: false map: - share:rw ports: 5000/tcp: 5000 ingress: true +image: ghcr.io/fredrikbaberg/addon-camera-aiortc-{arch} diff --git a/3dprinter-octoprint/icon.png b/octoprint/icon.png similarity index 100% rename from 3dprinter-octoprint/icon.png rename to octoprint/icon.png diff --git a/3dprinter-octoprint/logo.png b/octoprint/logo.png similarity index 100% rename from 3dprinter-octoprint/logo.png rename to octoprint/logo.png diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/nginx.sh b/octoprint/rootfs/etc/cont-init.d/nginx.sh similarity index 100% rename from 3dprinter-octoprint/rootfs/etc/cont-init.d/nginx.sh rename to octoprint/rootfs/etc/cont-init.d/nginx.sh diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh b/octoprint/rootfs/etc/cont-init.d/octoprint.sh similarity index 100% rename from 3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh rename to octoprint/rootfs/etc/cont-init.d/octoprint.sh diff --git a/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf b/octoprint/rootfs/etc/nginx/nginx.conf similarity index 100% rename from 3dprinter-octoprint/rootfs/etc/nginx/nginx.conf rename to octoprint/rootfs/etc/nginx/nginx.conf diff --git a/3dprinter-octoprint/rootfs/etc/services.d/nginx/finish b/octoprint/rootfs/etc/services.d/nginx/finish similarity index 100% rename from 3dprinter-octoprint/rootfs/etc/services.d/nginx/finish rename to octoprint/rootfs/etc/services.d/nginx/finish diff --git a/3dprinter-octoprint/rootfs/etc/services.d/nginx/run b/octoprint/rootfs/etc/services.d/nginx/run similarity index 100% rename from 3dprinter-octoprint/rootfs/etc/services.d/nginx/run rename to octoprint/rootfs/etc/services.d/nginx/run diff --git a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish b/octoprint/rootfs/etc/services.d/octoprint/finish similarity index 100% rename from 3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish rename to octoprint/rootfs/etc/services.d/octoprint/finish diff --git a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run b/octoprint/rootfs/etc/services.d/octoprint/run similarity index 100% rename from 3dprinter-octoprint/rootfs/etc/services.d/octoprint/run rename to octoprint/rootfs/etc/services.d/octoprint/run diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/ingress.conf b/octoprint/rootfs/usr/share/tempio/ingress.conf similarity index 100% rename from 3dprinter-octoprint/rootfs/usr/share/tempio/ingress.conf rename to octoprint/rootfs/usr/share/tempio/ingress.conf diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/webui.conf b/octoprint/rootfs/usr/share/tempio/webui.conf similarity index 100% rename from 3dprinter-octoprint/rootfs/usr/share/tempio/webui.conf rename to octoprint/rootfs/usr/share/tempio/webui.conf diff --git a/3dprinter-octoprint/translations/en.yaml b/octoprint/translations/en.yaml similarity index 100% rename from 3dprinter-octoprint/translations/en.yaml rename to octoprint/translations/en.yaml