From 4ad16011c98ffeab0247de51caed8b0512f42936 Mon Sep 17 00:00:00 2001 From: Fredrik Baberg Date: Fri, 13 Jan 2023 18:54:41 +0100 Subject: [PATCH] Cleanup and update docs --- .github/workflows/camera-aiortc.yml | 54 -------------------------- .github/workflows/cleanup-packages.yml | 2 +- 3dprinter-octoprint/DOCS.md | 6 +-- camera-mjpg-streamer/DOCS.md | 2 +- 4 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 .github/workflows/camera-aiortc.yml diff --git a/.github/workflows/camera-aiortc.yml b/.github/workflows/camera-aiortc.yml deleted file mode 100644 index 2875a52..0000000 --- a/.github/workflows/camera-aiortc.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: camera-rtc manual build - -on: - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - name: Build ${{ matrix.arch }} ${{ matrix.addon }} add-on - strategy: - matrix: - addon: ["camera-rtc"] - arch: ["aarch64", "amd64", "armhf", "armv7"] - 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/cleanup-packages.yml b/.github/workflows/cleanup-packages.yml index f693b0d..2102164 100644 --- a/.github/workflows/cleanup-packages.yml +++ b/.github/workflows/cleanup-packages.yml @@ -14,7 +14,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} user: fredrikbaberg type: container - keep: 5 + keep: 1 names: | ha-addon-3dprinter-octoprint-aarch64 ha-addon-3dprinter-octoprint-amd64 diff --git a/3dprinter-octoprint/DOCS.md b/3dprinter-octoprint/DOCS.md index b74347d..c6ac894 100644 --- a/3dprinter-octoprint/DOCS.md +++ b/3dprinter-octoprint/DOCS.md @@ -11,7 +11,7 @@ By setting trusted proxies you should be able to use HTTPS *if you have placed a # OctoPrint integration You can use the OctoPrint integration with this addon. Go to Home Assistant, add integration OctoPrint, and use the following: -- Host: `b7aa59c4-3dprinter-octoprint` +- Host: `cce6f2d5-3dprinter-octoprint` - port: 5000 - Don't use SSL (leave unchecked) @@ -22,7 +22,7 @@ Go to OctoPrint WebUI, you should see a request for authentication. There is no camera server in the addon, 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: -> `http://b7aa59c4-camera-mjpg-streamer/?action=snapshot`. +> `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. @@ -37,4 +37,4 @@ I have tried to find a solution to this, without success. Therefore I decided to 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! \ No newline at end of file +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! diff --git a/camera-mjpg-streamer/DOCS.md b/camera-mjpg-streamer/DOCS.md index 66169a9..85308d3 100644 --- a/camera-mjpg-streamer/DOCS.md +++ b/camera-mjpg-streamer/DOCS.md @@ -14,7 +14,7 @@ The camera stream and snapshot can be accessed by e.g. [MJPEG IP Camera](https:/ * MJPEG URL: `http:///?action=stream` * Still image URL: `http:///?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%2F3dprinter-addons). +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). ## Tests