Skip to content

Fix apps devcontainer folder #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agners merged 4 commits into from
Jun 29, 2026
Merged

Fix apps devcontainer folder #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d72b3e
fix workspace folder from old addons to new apps
KaiGrassnick Jun 28, 2026
7820e62
Change workspace mount path for compatibility
KaiGrassnick Jun 28, 2026
1d14080
bump apps version to 6
KaiGrassnick Jun 28, 2026
330ba2d
Update apps/rootfs/usr/bin/devcontainer_bootstrap
agners Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/builder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,21 @@ 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:
context: .
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' }}

2 changes: 1 addition & 1 deletion apps/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand Down
2 changes: 1 addition & 1 deletion apps/rootfs/usr/bin/devcontainer_bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apps/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5
6
Loading