Merge remote-tracking branch 'origin/dev' into gha-builder

Fix container-(username|password) -> container-registry-(username|password)
Use updated build-image action inputs, sort alphabetically
2026-03-07 04:31:24 +00:00 · 2026-03-05 12:17:11 +01:00 · 2026-03-05 12:14:36 +01:00 · 2026-03-05 12:10:43 +01:00 · 2026-03-05 11:22:12 +01:00 · 2026-03-04 18:26:21 +01:00
18 changed files with 443 additions and 233 deletions
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -35,6 +35,7 @@ jobs:
      channel: ${{ steps.version.outputs.channel }}
      publish: ${{ steps.version.outputs.publish }}
      architectures: ${{ env.ARCHITECTURES }}
+      base_image_version: ${{ env.BASE_IMAGE_VERSION }}
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -74,43 +75,8 @@ jobs:
        env:
          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}

-      - name: Archive translations
-        shell: bash
-        run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
-
-      - name: Upload translations
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
-        with:
-          name: translations
-          path: translations.tar.gz
-          if-no-files-found: error
-
-  build_base:
-    name: Build ${{ matrix.arch }} base core image
-    if: github.repository_owner == 'home-assistant'
-    needs: init
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read # To check out the repository
-      packages: write # To push to GHCR
-      id-token: write # For cosign signing
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: ${{ fromJson(needs.init.outputs.architectures) }}
-        include:
-          - arch: amd64
-            os: ubuntu-latest
-          - arch: aarch64
-            os: ubuntu-24.04-arm
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-
      - name: Download nightly wheels of frontend
-        if: needs.init.outputs.channel == 'dev'
+        if: steps.version.outputs.channel == 'dev'
        uses: dawidd6/action-download-artifact@2536c51d3d126276eb39f74d6bc9c72ac6ef30d3 # v16
        with:
          github_token: ${{secrets.GITHUB_TOKEN}}
@@ -121,7 +87,7 @@ jobs:
          name: wheels

      - name: Download nightly wheels of intents
-        if: needs.init.outputs.channel == 'dev'
+        if: steps.version.outputs.channel == 'dev'
        uses: dawidd6/action-download-artifact@2536c51d3d126276eb39f74d6bc9c72ac6ef30d3 # v16
        with:
          github_token: ${{secrets.GITHUB_TOKEN}}
@@ -131,18 +97,12 @@ jobs:
          workflow_conclusion: success
          name: package

-      - name: Set up Python
-        if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
-        with:
-          python-version-file: ".python-version"
-
      - name: Adjust nightly version
-        if: needs.init.outputs.channel == 'dev'
+        if: steps.version.outputs.channel == 'dev'
        shell: bash
        env:
          UV_PRERELEASE: allow
-          VERSION: ${{ needs.init.outputs.version }}
+          VERSION: ${{ steps.version.outputs.version }}
        run: |
          python3 -m pip install "$(grep '^uv' < requirements.txt)"
          uv pip install packaging tomli
@@ -180,92 +140,72 @@ jobs:
            sed -i "s|home-assistant-intents==.*||" requirements_all.txt requirements.txt
          fi

-      - name: Download translations
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
-        with:
-          name: translations
-
-      - name: Extract translations
-        run: |
-          tar xvf translations.tar.gz
-          rm translations.tar.gz
-
      - name: Write meta info file
        shell: bash
        run: |
          echo "${GITHUB_SHA};${GITHUB_REF};${GITHUB_EVENT_NAME};${GITHUB_ACTOR}" > rootfs/OFFICIAL_IMAGE

-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+      - name: Upload build context overlay
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          name: build-context
+          if-no-files-found: ignore
+          path: |
+            homeassistant/components/*/translations/
+            rootfs/OFFICIAL_IMAGE
+            home_assistant_frontend-*.whl
+            home_assistant_intents-*.whl
+            homeassistant/const.py
+            homeassistant/components/frontend/manifest.json
+            homeassistant/components/conversation/manifest.json
+            homeassistant/package_constraints.txt
+            requirements_all.txt
+            requirements.txt
+            pyproject.toml

-      - name: Install Cosign
-        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
+  build_base:
+    name: Build ${{ matrix.arch }} base core image
+    if: github.repository_owner == 'home-assistant'
+    needs: init
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: read # To check out the repository
+      packages: write # To push to GHCR
+      id-token: write # For cosign signing
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: amd64
+            os: ubuntu-24.04
+          - arch: aarch64
+            os: ubuntu-24.04-arm
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
-          cosign-release: "v2.5.3"
+          persist-credentials: false

-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
-
-      - name: Build variables
-        id: vars
-        shell: bash
-        env:
-          ARCH: ${{ matrix.arch }}
-        run: |
-          echo "base_image=ghcr.io/home-assistant/${ARCH}-homeassistant-base:${BASE_IMAGE_VERSION}" >> "$GITHUB_OUTPUT"
-          echo "cache_image=ghcr.io/home-assistant/${ARCH}-homeassistant:latest" >> "$GITHUB_OUTPUT"
-          echo "created=$(date --rfc-3339=seconds --utc)" >> "$GITHUB_OUTPUT"
-
-      - name: Verify base image signature
-        env:
-          BASE_IMAGE: ${{ steps.vars.outputs.base_image }}
-        run: |
-          cosign verify \
-            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
-            --certificate-identity-regexp "https://github.com/home-assistant/docker/.*" \
-            "${BASE_IMAGE}"
-
-      - name: Verify cache image signature
-        id: cache
-        continue-on-error: true
-        env:
-          CACHE_IMAGE: ${{ steps.vars.outputs.cache_image }}
-        run: |
-          cosign verify \
-            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
-            --certificate-identity-regexp "https://github.com/home-assistant/core/.*" \
-            "${CACHE_IMAGE}"
+      - name: Download build context overlay
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        with:
+          name: build-context

      - name: Build base image
-        id: build
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: home-assistant/builder/actions/build-image@gha-builder # zizmor: ignore[unpinned-uses]
        with:
-          context: .
-          file: ./Dockerfile
-          platforms: ${{ steps.vars.outputs.platform }}
-          push: true
-          cache-from: ${{ steps.cache.outcome == 'success' && steps.vars.outputs.cache_image || '' }}
+          arch: ${{ matrix.arch }}
          build-args: |
-            BUILD_FROM=${{ steps.vars.outputs.base_image }}
-          tags: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
-          outputs: type=image,push=true,compression=zstd,compression-level=9,force-compression=true,oci-mediatypes=true
-          labels: |
-            io.hass.arch=${{ matrix.arch }}
-            io.hass.version=${{ needs.init.outputs.version }}
-            org.opencontainers.image.created=${{ steps.vars.outputs.created }}
-            org.opencontainers.image.version=${{ needs.init.outputs.version }}
-
-      - name: Sign image
-        env:
-          ARCH: ${{ matrix.arch }}
-          VERSION: ${{ needs.init.outputs.version }}
-          DIGEST: ${{ steps.build.outputs.digest }}
-        run: |
-          cosign sign --yes "ghcr.io/home-assistant/${ARCH}-homeassistant:${VERSION}@${DIGEST}"
+            BUILD_FROM=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ needs.init.outputs.base_image_version }}
+          cache-gha: false
+          container-registry-password: ${{ secrets.GITHUB_TOKEN }}
+          context: .
+          cosign-base-identity: "https://github.com/home-assistant/docker/.*"
+          cosign-base-verify: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ needs.init.outputs.base_image_version }}
+          image: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant
+          image-tags: ${{ needs.init.outputs.version }}
+          push: true
+          version: ${{ needs.init.outputs.version }}

  build_machine:
    name: Build ${{ matrix.machine }} machine core image
@@ -314,35 +254,38 @@ jobs:
        with:
          persist-credentials: false

-      - name: Set build additional args
+      - name: Compute extra tags
+        id: tags
+        shell: bash
        env:
          VERSION: ${{ needs.init.outputs.version }}
        run: |
-          # Create general tags
          if [[ "${VERSION}" =~ d ]]; then
-            echo "BUILD_ARGS=--additional-tag dev" >> $GITHUB_ENV
+            echo "extra_tags=dev" >> "$GITHUB_OUTPUT"
          elif [[ "${VERSION}" =~ b ]]; then
-            echo "BUILD_ARGS=--additional-tag beta" >> $GITHUB_ENV
+            echo "extra_tags=beta" >> "$GITHUB_OUTPUT"
          else
-            echo "BUILD_ARGS=--additional-tag stable" >> $GITHUB_ENV
+            echo "extra_tags=stable" >> "$GITHUB_OUTPUT"
          fi

-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+      - name: Build machine image
+        uses: home-assistant/builder/actions/build-image@gha-builder # zizmor: ignore[unpinned-uses]
        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build base image
-        uses: home-assistant/builder@6cb4fd3d1338b6e22d0958a4bcb53e0965ea63b4 # 2026.02.1
-        with:
-          image: ${{ matrix.arch }}
-          args: |
-            $BUILD_ARGS \
-            --target /data/machine \
-            --cosign \
-            --machine "${{ needs.init.outputs.version }}=${{ matrix.machine }}"
+          arch: ${{ matrix.arch }}
+          build-args: |
+            BUILD_FROM=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
+          cache-gha: false
+          container-registry-password: ${{ secrets.GITHUB_TOKEN }}
+          context: machine/
+          cosign-base-identity: "https://github.com/home-assistant/core/.*"
+          cosign-base-verify: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
+          file: machine/${{ matrix.machine }}
+          image: ghcr.io/home-assistant/${{ matrix.machine }}-homeassistant
+          image-tags: |
+            ${{ needs.init.outputs.version }}
+            ${{ steps.tags.outputs.extra_tags }}
+          push: true
+          version: ${{ needs.init.outputs.version }}

  publish_ha:
    name: Publish version files
@@ -542,15 +485,10 @@ jobs:
        with:
          python-version-file: ".python-version"

-      - name: Download translations
+      - name: Download build context overlay
        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
        with:
-          name: translations
-
-      - name: Extract translations
-        run: |
-          tar xvf translations.tar.gz
-          rm translations.tar.gz
+          name: build-context

      - name: Build package
        shell: bash
--- a/31
+++ b/31
@@ -1,19 +1,9 @@
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker
-ARG BUILD_FROM
+ARG BUILD_FROM=ghcr.io/home-assistant/amd64-homeassistant-base:latest
 FROM ${BUILD_FROM}

-LABEL \
-    io.hass.type="core" \
-    org.opencontainers.image.authors="The Home Assistant Authors" \
-    org.opencontainers.image.description="Open-source home automation platform running on Python 3" \
-    org.opencontainers.image.documentation="https://www.home-assistant.io/docs/" \
-    org.opencontainers.image.licenses="Apache-2.0" \
-    org.opencontainers.image.source="https://github.com/home-assistant/core" \
-    org.opencontainers.image.title="Home Assistant" \
-    org.opencontainers.image.url="https://www.home-assistant.io/"
-
 # Synchronize with homeassistant/core.py:async_stop
 ENV \
    S6_SERVICES_GRACETIME=240000 \
@@ -60,3 +50,22 @@ RUN \
        homeassistant/homeassistant

 WORKDIR /config
+
+ARG BUILD_ARCH=amd64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}" \
+    org.opencontainers.image.authors="The Home Assistant Authors" \
+    org.opencontainers.image.description="Open-source home automation platform running on Python 3" \
+    org.opencontainers.image.documentation="https://www.home-assistant.io/docs/" \
+    org.opencontainers.image.licenses="Apache-2.0" \
+    org.opencontainers.image.title="Home Assistant" \
+    org.opencontainers.image.url="https://www.home-assistant.io/"
--- a/machine/build.yaml
+++ b/machine/build.yaml
@@ -1,10 +0,0 @@
-image: ghcr.io/home-assistant/{machine}-homeassistant
-build_from:
-  aarch64: "ghcr.io/home-assistant/aarch64-homeassistant:"
-  amd64: "ghcr.io/home-assistant/amd64-homeassistant:"
-cosign:
-  base_identity: https://github.com/home-assistant/core/.*
-  identity: https://github.com/home-assistant/core/.*
-labels:
-  io.hass.type: core
-  org.opencontainers.image.source: https://github.com/home-assistant/core
--- a/machine/generic-x86-64
+++ b/machine/generic-x86-64
@@ -1,7 +1,21 @@
-ARG \
-    BUILD_FROM
-
-FROM $BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/amd64-homeassistant:latest
+FROM ${BUILD_FROM}

 RUN apk --no-cache add \
    libva-intel-driver
+
+ARG BUILD_ARCH=amd64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/green
+++ b/machine/green
@@ -1,4 +1,18 @@
-ARG \
-    BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

-FROM $BUILD_FROM
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/intel-nuc
+++ b/machine/intel-nuc
@@ -1,10 +1,21 @@
-ARG \
-    BUILD_FROM
-
-FROM $BUILD_FROM
-
-# NOTE: intel-nuc will be replaced by generic-x86-64. Make sure to apply
-# changes in generic-x86-64 as well.
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/amd64-homeassistant:latest
+FROM ${BUILD_FROM}

 RUN apk --no-cache add \
    libva-intel-driver
+
+ARG BUILD_ARCH=amd64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/khadas-vim3
+++ b/machine/khadas-vim3
@@ -1,4 +1,18 @@
-ARG \
-    BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

-FROM $BUILD_FROM
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/odroid-c2
+++ b/machine/odroid-c2
@@ -1,4 +1,18 @@
-ARG \
-    BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

-FROM $BUILD_FROM
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/odroid-c4
+++ b/machine/odroid-c4
@@ -1,4 +1,18 @@
-ARG \
-    BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

-FROM $BUILD_FROM
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/odroid-m1
+++ b/machine/odroid-m1
@@ -1,4 +1,18 @@
-ARG \
-    BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

-FROM $BUILD_FROM
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/odroid-n2
+++ b/machine/odroid-n2
@@ -1,4 +1,18 @@
-ARG \
-    BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

-FROM $BUILD_FROM
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/qemuarm-64
+++ b/machine/qemuarm-64
@@ -1,4 +1,18 @@
-ARG \
-    BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

-FROM $BUILD_FROM
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/qemux86-64
+++ b/machine/qemux86-64
@@ -1,4 +1,18 @@
-ARG \
-    BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/amd64-homeassistant:latest
+FROM ${BUILD_FROM}

-FROM $BUILD_FROM
+ARG BUILD_ARCH=amd64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/raspberrypi3-64
+++ b/machine/raspberrypi3-64
@@ -1,7 +1,21 @@
-ARG \
-    BUILD_FROM
-
-FROM $BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

 RUN apk --no-cache add \
-        raspberrypi-utils
+    raspberrypi-utils
+
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/raspberrypi4-64
+++ b/machine/raspberrypi4-64
@@ -1,7 +1,21 @@
-ARG \
-    BUILD_FROM
-
-FROM $BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

 RUN apk --no-cache add \
-        raspberrypi-utils
+    raspberrypi-utils
+
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/raspberrypi5-64
+++ b/machine/raspberrypi5-64
@@ -1,7 +1,21 @@
-ARG \
-    BUILD_FROM
-
-FROM $BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

 RUN apk --no-cache add \
-        raspberrypi-utils
+    raspberrypi-utils
+
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/machine/yellow
+++ b/machine/yellow
@@ -1,7 +1,21 @@
-ARG \
-    BUILD_FROM
-
-FROM $BUILD_FROM
+# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
+FROM ${BUILD_FROM}

 RUN apk --no-cache add \
-        raspberrypi-utils
+    raspberrypi-utils
+
+ARG BUILD_ARCH=aarch64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.version="${BUILD_VERSION}" \
+    org.opencontainers.image.created="${BUILD_DATE}" \
+    org.opencontainers.image.version="${BUILD_VERSION}" \
+    org.opencontainers.image.source="${BUILD_REPOSITORY}"
--- a/script/hassfest/docker.py
+++ b/script/hassfest/docker.py
@@ -16,19 +16,9 @@ _GO2RTC_SHA = (
 DOCKERFILE_TEMPLATE = r"""# Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker
-ARG BUILD_FROM
+ARG BUILD_FROM=ghcr.io/home-assistant/amd64-homeassistant-base:latest
 FROM ${{BUILD_FROM}}

-LABEL \
-    io.hass.type="core" \
-    org.opencontainers.image.authors="The Home Assistant Authors" \
-    org.opencontainers.image.description="Open-source home automation platform running on Python 3" \
-    org.opencontainers.image.documentation="https://www.home-assistant.io/docs/" \
-    org.opencontainers.image.licenses="Apache-2.0" \
-    org.opencontainers.image.source="https://github.com/home-assistant/core" \
-    org.opencontainers.image.title="Home Assistant" \
-    org.opencontainers.image.url="https://www.home-assistant.io/"
-
 # Synchronize with homeassistant/core.py:async_stop
 ENV \
    S6_SERVICES_GRACETIME={timeout} \
@@ -75,8 +65,88 @@ RUN \
        homeassistant/homeassistant

 WORKDIR /config
+
+ARG BUILD_ARCH=amd64
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${{BUILD_ARCH}}" \
+    io.hass.version="${{BUILD_VERSION}}" \
+    org.opencontainers.image.created="${{BUILD_DATE}}" \
+    org.opencontainers.image.version="${{BUILD_VERSION}}" \
+    org.opencontainers.image.source="${{BUILD_REPOSITORY}}" \
+    org.opencontainers.image.authors="The Home Assistant Authors" \
+    org.opencontainers.image.description="Open-source home automation platform running on Python 3" \
+    org.opencontainers.image.documentation="https://www.home-assistant.io/docs/" \
+    org.opencontainers.image.licenses="Apache-2.0" \
+    org.opencontainers.image.title="Home Assistant" \
+    org.opencontainers.image.url="https://www.home-assistant.io/"
 """

+
+@dataclass(frozen=True)
+class _MachineConfig:
+    """Machine-specific Dockerfile configuration."""
+
+    arch: str
+    packages: tuple[str, ...] = ()
+
+
+_MACHINES = {
+    "generic-x86-64": _MachineConfig(arch="amd64", packages=("libva-intel-driver",)),
+    "green": _MachineConfig(arch="aarch64"),
+    "intel-nuc": _MachineConfig(arch="amd64", packages=("libva-intel-driver",)),
+    "khadas-vim3": _MachineConfig(arch="aarch64"),
+    "odroid-c2": _MachineConfig(arch="aarch64"),
+    "odroid-c4": _MachineConfig(arch="aarch64"),
+    "odroid-m1": _MachineConfig(arch="aarch64"),
+    "odroid-n2": _MachineConfig(arch="aarch64"),
+    "qemuarm-64": _MachineConfig(arch="aarch64"),
+    "qemux86-64": _MachineConfig(arch="amd64"),
+    "raspberrypi3-64": _MachineConfig(arch="aarch64", packages=("raspberrypi-utils",)),
+    "raspberrypi4-64": _MachineConfig(arch="aarch64", packages=("raspberrypi-utils",)),
+    "raspberrypi5-64": _MachineConfig(arch="aarch64", packages=("raspberrypi-utils",)),
+    "yellow": _MachineConfig(arch="aarch64", packages=("raspberrypi-utils",)),
+}
+
+_MACHINE_DOCKERFILE_TEMPLATE = r"""# Automatically generated by hassfest.
+#
+# To update, run python3 -m script.hassfest -p docker
+ARG BUILD_FROM=ghcr.io/home-assistant/{arch}-homeassistant:latest
+FROM ${{BUILD_FROM}}
+{extra_packages}
+ARG BUILD_ARCH={arch}
+ARG BUILD_DATE="1970-01-01 00:00:00+00:00"
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION=0.0.0-local
+
+LABEL \
+    io.hass.type="core" \
+    io.hass.arch="${{BUILD_ARCH}}" \
+    io.hass.version="${{BUILD_VERSION}}" \
+    org.opencontainers.image.created="${{BUILD_DATE}}" \
+    org.opencontainers.image.version="${{BUILD_VERSION}}" \
+    org.opencontainers.image.source="${{BUILD_REPOSITORY}}"
+"""
+
+
+def _generate_machine_dockerfile(machine_config: _MachineConfig) -> str:
+    """Generate a machine Dockerfile from configuration."""
+    if machine_config.packages:
+        pkg_lines = " \\\n        ".join(machine_config.packages)
+        extra_packages = f"\nRUN apk --no-cache add \\\n    {pkg_lines}\n"
+    else:
+        extra_packages = ""
+
+    return _MACHINE_DOCKERFILE_TEMPLATE.format(
+        arch=machine_config.arch,
+        extra_packages=extra_packages,
+    )
+
+
 _HASSFEST_TEMPLATE = r"""# Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker
@@ -174,7 +244,7 @@ def _generate_files(config: Config) -> list[File]:
        config.root / "requirements_test_pre_commit.txt", {"ruff"}
    )

-    return [
+    files = [
        File(
            DOCKERFILE_TEMPLATE.format(
                timeout=timeout,
@@ -192,6 +262,16 @@ def _generate_files(config: Config) -> list[File]:
        ),
    ]

+    for machine_name, machine_config in sorted(_MACHINES.items()):
+        files.append(
+            File(
+                _generate_machine_dockerfile(machine_config),
+                config.root / "machine" / machine_name,
+            )
+        )
+
+    return files
+

 def validate(integrations: dict[str, Integration], config: Config) -> None:
    """Validate dockerfile."""
Author	SHA1	Message	Date
Jan Čermák	36cb3e21fe	Merge remote-tracking branch 'origin/dev' into gha-builder	2026-03-05 12:17:11 +01:00
Jan Čermák	f645b232f9	Fix container-(username\|password) -> container-registry-(username\|password)	2026-03-05 12:14:36 +01:00
Jan Čermák	e8454d9b2c	Use updated build-image action inputs, sort alphabetically	2026-03-05 12:10:43 +01:00
Jan Čermák	02ae9b2f71	Generate machine dockerfiles using hassfest script	2026-03-05 11:22:12 +01:00
Jan Čermák	f6f7390063	Restore build context also in build_python	2026-03-04 18:26:21 +01:00
Jan Čermák	bfa1fd7f1b	Use new home-assistant/builder actions for image builds This PR completely drops usage of the builder action in favor of new actions introduced in home-assistant/builder#273. This results in faster builds with better caching options and simple local builds using Docker BuildKit. The image dependency chain currently still uses per-arch builds but once docker-base and docker repositories start publishing multi-arch images, we can simplify the action a bit further. The idea to use composite actions comes from #162245 and this PR fully predates it. There is minor difference that the files generated twice in per-arch builds are now generated and archived by the init job.	2026-03-04 18:05:12 +01:00