diff --git a/.github/workflows/3dprinter-octoprint.yml b/.github/workflows/3dprinter-octoprint.yml new file mode 100644 index 0000000..c99e69c --- /dev/null +++ b/.github/workflows/3dprinter-octoprint.yml @@ -0,0 +1,54 @@ +name: 3dprinter-octoprint manual build + +on: + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + name: Build ${{ matrix.arch }} ${{ matrix.addon }} add-on + strategy: + matrix: + addon: ["3dprinter-octoprint"] + arch: ["aarch64", "amd64", "armhf", "armv7", "i386"] + steps: + - name: Check out the repository + uses: actions/checkout@v3 + + - name: Get information + id: info + uses: home-assistant/actions/helpers/info@master + with: + path: "./${{ matrix.addon }}" + + - name: Check if add-on should be built + id: check + run: | + if [[ "${{ steps.info.outputs.architectures }}" =~ ${{ matrix.arch }} ]]; then + echo "::set-output name=build_arch::true"; + echo "::set-output name=image::$(echo ${{ steps.info.outputs.image }} | cut -d'/' -f3)"; + else + echo "${{ matrix.arch }} is not a valid arch for ${{ matrix.addon }}, skipping build"; + echo "::set-output name=build_arch::false"; + fi + + - name: Login to GitHub Container Registry + if: env.BUILD_ARGS != '--test' + uses: docker/login-action@v2.0.0 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build ${{ matrix.addon }} add-on + if: steps.check.outputs.build_arch == 'true' + uses: home-assistant/builder@2022.03.1 + with: + args: | + ${{ env.BUILD_ARGS }} \ + --${{ matrix.arch }} \ + --target /data/${{ matrix.addon }} \ + --image "${{ steps.check.outputs.image }}" \ + --docker-hub "ghcr.io/${{ github.repository_owner }}" \ + --addon \ + --docker-hub-check diff --git a/.github/workflows/camera-aiortc.yml b/.github/workflows/camera-aiortc.yml index 4c51382..2875a52 100644 --- a/.github/workflows/camera-aiortc.yml +++ b/.github/workflows/camera-aiortc.yml @@ -1,4 +1,4 @@ -name: camera-aiortc manual build +name: camera-rtc manual build on: workflow_dispatch: diff --git a/octoprint/DOCS.md b/3dprinter-octoprint/DOCS.md similarity index 100% rename from octoprint/DOCS.md rename to 3dprinter-octoprint/DOCS.md diff --git a/octoprint/Dockerfile b/3dprinter-octoprint/Dockerfile similarity index 100% rename from octoprint/Dockerfile rename to 3dprinter-octoprint/Dockerfile diff --git a/octoprint/README.md b/3dprinter-octoprint/README.md similarity index 100% rename from octoprint/README.md rename to 3dprinter-octoprint/README.md diff --git a/octoprint/apparmor.txt b/3dprinter-octoprint/apparmor.txt similarity index 100% rename from octoprint/apparmor.txt rename to 3dprinter-octoprint/apparmor.txt diff --git a/octoprint/build.yaml b/3dprinter-octoprint/build.yaml similarity index 100% rename from octoprint/build.yaml rename to 3dprinter-octoprint/build.yaml diff --git a/octoprint/config.yaml b/3dprinter-octoprint/config.yaml similarity index 70% rename from octoprint/config.yaml rename to 3dprinter-octoprint/config.yaml index 9653f6f..e41c49d 100644 --- a/octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,7 +1,7 @@ name: "3DPrinter-OctoPrint" version: "2022.6.028" slug: "3dprinter-octoprint" -description: "New instance of OctoPrint" +description: "OctoPrint as an addon, no additional bells and whistles." url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint" arch: - aarch64 @@ -16,4 +16,4 @@ map: ports: 5000/tcp: 5000 ingress: true -image: ghcr.io/fredrikbaberg/addon-camera-aiortc-{arch} +image: ghcr.io/fredrikbaberg/addon-3dprinter-octoprint-{arch} diff --git a/octoprint/icon.png b/3dprinter-octoprint/icon.png similarity index 100% rename from octoprint/icon.png rename to 3dprinter-octoprint/icon.png diff --git a/octoprint/logo.png b/3dprinter-octoprint/logo.png similarity index 100% rename from octoprint/logo.png rename to 3dprinter-octoprint/logo.png diff --git a/octoprint/rootfs/etc/cont-init.d/nginx.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/nginx.sh similarity index 100% rename from octoprint/rootfs/etc/cont-init.d/nginx.sh rename to 3dprinter-octoprint/rootfs/etc/cont-init.d/nginx.sh diff --git a/octoprint/rootfs/etc/cont-init.d/octoprint.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh similarity index 100% rename from octoprint/rootfs/etc/cont-init.d/octoprint.sh rename to 3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh diff --git a/octoprint/rootfs/etc/nginx/nginx.conf b/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf similarity index 100% rename from octoprint/rootfs/etc/nginx/nginx.conf rename to 3dprinter-octoprint/rootfs/etc/nginx/nginx.conf diff --git a/octoprint/rootfs/etc/services.d/nginx/finish b/3dprinter-octoprint/rootfs/etc/services.d/nginx/finish similarity index 100% rename from octoprint/rootfs/etc/services.d/nginx/finish rename to 3dprinter-octoprint/rootfs/etc/services.d/nginx/finish diff --git a/octoprint/rootfs/etc/services.d/nginx/run b/3dprinter-octoprint/rootfs/etc/services.d/nginx/run similarity index 100% rename from octoprint/rootfs/etc/services.d/nginx/run rename to 3dprinter-octoprint/rootfs/etc/services.d/nginx/run diff --git a/octoprint/rootfs/etc/services.d/octoprint/finish b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish similarity index 100% rename from octoprint/rootfs/etc/services.d/octoprint/finish rename to 3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish diff --git a/octoprint/rootfs/etc/services.d/octoprint/run b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run similarity index 100% rename from octoprint/rootfs/etc/services.d/octoprint/run rename to 3dprinter-octoprint/rootfs/etc/services.d/octoprint/run diff --git a/octoprint/rootfs/usr/share/tempio/ingress.conf b/3dprinter-octoprint/rootfs/usr/share/tempio/ingress.conf similarity index 100% rename from octoprint/rootfs/usr/share/tempio/ingress.conf rename to 3dprinter-octoprint/rootfs/usr/share/tempio/ingress.conf diff --git a/octoprint/rootfs/usr/share/tempio/webui.conf b/3dprinter-octoprint/rootfs/usr/share/tempio/webui.conf similarity index 100% rename from octoprint/rootfs/usr/share/tempio/webui.conf rename to 3dprinter-octoprint/rootfs/usr/share/tempio/webui.conf diff --git a/octoprint/translations/en.yaml b/3dprinter-octoprint/translations/en.yaml similarity index 100% rename from octoprint/translations/en.yaml rename to 3dprinter-octoprint/translations/en.yaml diff --git a/README.md b/README.md index 9dbeb4d..0e3c86a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # 3dprinter-addons -Addons for Home-Assistant, related to 3DPrinter. +Addons for Home-Assistant, related to 3D printing. ## Install @@ -10,11 +10,16 @@ You can use the following button to add the repository to your Home Assistant in ## Addons +Not all addons are ready for use. + ### 3DPrinter-OctoPrint OctoPrint, plain and simple. - -### 3DPrinter-Camera +### Camera-mjpg-streamer For streaming camera feed. + +## Camera-RTC + +For streaming camera feed, using WebRTC. diff --git a/camera-mjpg-streamer/config.yaml b/camera-mjpg-streamer/config.yaml index acdce6b..c4fb579 100644 --- a/camera-mjpg-streamer/config.yaml +++ b/camera-mjpg-streamer/config.yaml @@ -1,4 +1,4 @@ -name: "mjpg-streamer" +name: "Camera-mjpg-streamer" version: "2022.7.002" slug: "camera-mjpg-streamer" description: "Camera streaming addon for Home Assistant, based on mjpg-streamer." diff --git a/octoprint/CHANGELOG.md b/octoprint/CHANGELOG.md deleted file mode 100644 index e69de29..0000000 diff --git a/repository.yaml b/repository.yaml index da69a8e..40e64fc 100644 --- a/repository.yaml +++ b/repository.yaml @@ -1,3 +1,3 @@ -name: fredrikbaberg Home-Asssistant 3DPrinter addons +name: fredrikbaberg 3DPrinter addons for Home-Asssistant url: https://github.com/fredrikbaberg/3dprinter-addons maintainer: Fredrik Baberg