From 0d72b3efab71678fcf921245f28624bd8b05a57e Mon Sep 17 00:00:00 2001 From: KaiGrassnick Date: Sun, 28 Jun 2026 14:29:50 +0200 Subject: [PATCH 1/4] fix workspace folder from old addons to new apps --- apps/devcontainer.json | 2 +- apps/rootfs/usr/bin/devcontainer_bootstrap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/devcontainer.json b/apps/devcontainer.json index dfc0b5c..250c0bc 100644 --- a/apps/devcontainer.json +++ b/apps/devcontainer.json @@ -6,7 +6,7 @@ "appPort": ["7123:8123", "7357:4357"], "postStartCommand": "bash devcontainer_bootstrap", "runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"], - "workspaceFolder": "/mnt/supervisor/addons/local/${localWorkspaceFolderBasename}", + "workspaceFolder": "/mnt/supervisor/apps/local/${localWorkspaceFolderBasename}", "workspaceMount": "source=${localWorkspaceFolder},target=${containerWorkspaceFolder},type=bind,consistency=cached", "containerEnv": { "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}", diff --git a/apps/rootfs/usr/bin/devcontainer_bootstrap b/apps/rootfs/usr/bin/devcontainer_bootstrap index 7df489d..d03f63f 100644 --- a/apps/rootfs/usr/bin/devcontainer_bootstrap +++ b/apps/rootfs/usr/bin/devcontainer_bootstrap @@ -2,7 +2,7 @@ set -e -workspace_mount="/mnt/supervisor/addons/local/$(basename "${WORKSPACE_DIRECTORY:?}")" +workspace_mount="/mnt/supervisor/apps/local/$(basename "${WORKSPACE_DIRECTORY:?}")" if ! mountpoint -q "${workspace_mount}"; then echo "WARNING: Mounting ${WORKSPACE_DIRECTORY} to ${workspace_mount}." >&2 echo "To avoid this warning, see https://github.com/home-assistant/devcontainer/pull/135." >&2 From 7820e621f8425e5699259f61c73721763ff4e5f7 Mon Sep 17 00:00:00 2001 From: KaiGrassnick Date: Sun, 28 Jun 2026 14:29:50 +0200 Subject: [PATCH 2/4] Change workspace mount path for compatibility Updated workspace mount path to reflect changes in Home Assistant versions. --- apps/rootfs/usr/bin/devcontainer_bootstrap | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/rootfs/usr/bin/devcontainer_bootstrap b/apps/rootfs/usr/bin/devcontainer_bootstrap index d03f63f..5276a70 100644 --- a/apps/rootfs/usr/bin/devcontainer_bootstrap +++ b/apps/rootfs/usr/bin/devcontainer_bootstrap @@ -2,6 +2,7 @@ set -e +# folder changed from addons to apps in newer homeassistant versions workspace_mount="/mnt/supervisor/apps/local/$(basename "${WORKSPACE_DIRECTORY:?}")" if ! mountpoint -q "${workspace_mount}"; then echo "WARNING: Mounting ${WORKSPACE_DIRECTORY} to ${workspace_mount}." >&2 From 1d14080028c19542597e4409572cb56e95d35775 Mon Sep 17 00:00:00 2001 From: KaiGrassnick Date: Sun, 28 Jun 2026 14:29:50 +0200 Subject: [PATCH 3/4] bump apps version to 6 lowercase repository owner to work on any repo --- .github/workflows/builder.yaml | 12 +++++++++--- apps/version | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/builder.yaml b/.github/workflows/builder.yaml index c187fc0..0351748 100644 --- a/.github/workflows/builder.yaml +++ b/.github/workflows/builder.yaml @@ -42,6 +42,12 @@ jobs: echo "version=$(head -1 ./${{ matrix.devcontainer }}/version)" >> $GITHUB_OUTPUT echo "gitsha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Lowercase repository_owner + id: repository_owner + run: | + GH_REPOSITORY_OWNER="${{ github.repository_owner }}" + echo "lc_owner=${GH_REPOSITORY_OWNER,,}" >> $GITHUB_OUTPUT + - name: 🛠️ Build devcontainer (${{ matrix.devcontainer }}) uses: docker/build-push-action@v7.2.0 with: @@ -49,8 +55,8 @@ jobs: file: ./${{ matrix.devcontainer }}/Dockerfile platforms: linux/amd64,linux/arm64 tags: | - ghcr.io/${{ github.repository_owner }}/devcontainer:${{ steps.get-version.outputs.version }}-${{ matrix.devcontainer }} - ghcr.io/${{ github.repository_owner }}/devcontainer:${{ matrix.devcontainer }} - ghcr.io/${{ github.repository_owner }}/devcontainer:${{ matrix.devcontainer }}-${{ steps.get-version.outputs.gitsha }} + ghcr.io/${{ steps.repository_owner.outputs.lc_owner }}/devcontainer:${{ steps.get-version.outputs.version }}-${{ matrix.devcontainer }} + ghcr.io/${{ steps.repository_owner.outputs.lc_owner }}/devcontainer:${{ matrix.devcontainer }} + ghcr.io/${{ steps.repository_owner.outputs.lc_owner }}/devcontainer:${{ matrix.devcontainer }}-${{ steps.get-version.outputs.gitsha }} push: ${{ github.event_name == 'push' }} diff --git a/apps/version b/apps/version index 7ed6ff8..1e8b314 100644 --- a/apps/version +++ b/apps/version @@ -1 +1 @@ -5 +6 From 330ba2d225ec27d8a11f2fa77b1cf6d564f07786 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 29 Jun 2026 22:44:57 +0200 Subject: [PATCH 4/4] Update apps/rootfs/usr/bin/devcontainer_bootstrap --- apps/rootfs/usr/bin/devcontainer_bootstrap | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/rootfs/usr/bin/devcontainer_bootstrap b/apps/rootfs/usr/bin/devcontainer_bootstrap index 5276a70..d03f63f 100644 --- a/apps/rootfs/usr/bin/devcontainer_bootstrap +++ b/apps/rootfs/usr/bin/devcontainer_bootstrap @@ -2,7 +2,6 @@ set -e -# folder changed from addons to apps in newer homeassistant versions workspace_mount="/mnt/supervisor/apps/local/$(basename "${WORKSPACE_DIRECTORY:?}")" if ! mountpoint -q "${workspace_mount}"; then echo "WARNING: Mounting ${WORKSPACE_DIRECTORY} to ${workspace_mount}." >&2