Merge remote-tracking branch 'origin/dev' into edenhaus/docker-syntax

Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

Dockerfile.dev

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 FROM mcr.microsoft.com/vscode/devcontainers/base:debian
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

machine/generic-x86-64

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/green

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/khadas-vim3

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/odroid-c2

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/odroid-c4

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/odroid-m1

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/odroid-n2

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/qemuarm-64

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/qemux86-64

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/raspberrypi3-64

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/raspberrypi4-64

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/raspberrypi5-64

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

machine/yellow

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker

script/hassfest/docker.py

@@ -8,11 +8,17 @@ from homeassistant.util import executor, thread
 
 from .model import Config, Integration
 
+# Don't forget to update also Dockerfile.dev when updating this.
+_DOCKERFILE_SYNTAX_SHA = (
+    "2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769"  # 1.23.0
+)
+
 _GO2RTC_SHA = (
     "675c318b23c06fd862a61d262240c9a63436b4050d177ffc68a32710d9e05bae"  # 1.9.14
 )
 
-DOCKERFILE_TEMPLATE = r"""# Automatically generated by hassfest.
+DOCKERFILE_TEMPLATE = r"""# syntax=docker/dockerfile@sha256:{dockerfile_syntax}
+# Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker
 ARG BUILD_FROM
@@ -97,7 +103,8 @@ _MACHINES = {
     "yellow": _MachineConfig(arch="aarch64", packages=("raspberrypi-utils",)),
 }
 
-_MACHINE_DOCKERFILE_TEMPLATE = r"""# Automatically generated by hassfest.
+_MACHINE_DOCKERFILE_TEMPLATE = r"""# syntax=docker/dockerfile@sha256:{dockerfile_syntax}
+# Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker
 ARG BUILD_FROM=ghcr.io/home-assistant/{arch}-homeassistant:latest
@@ -118,13 +125,15 @@ def _generate_machine_dockerfile(
         extra_packages = ""
 
     return _MACHINE_DOCKERFILE_TEMPLATE.format(
+        dockerfile_syntax=_DOCKERFILE_SYNTAX_SHA,
         arch=machine_config.arch,
         extra_packages=extra_packages,
         machine=machine_name,
     )
 
 
-_HASSFEST_TEMPLATE = r"""# Automatically generated by hassfest.
+_HASSFEST_TEMPLATE = r"""# syntax=docker/dockerfile@sha256:{dockerfile_syntax}
+# Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker
 FROM python:3.14-alpine
@@ -188,13 +197,16 @@ def _generate_files(config: Config) -> list[File]:
     files = [
         File(
             DOCKERFILE_TEMPLATE.format(
+                dockerfile_syntax=_DOCKERFILE_SYNTAX_SHA,
                 timeout=timeout,
                 go2rtc=_GO2RTC_SHA,
             ),
             config.root / "Dockerfile",
         ),
         File(
-            _HASSFEST_TEMPLATE.format(),
+            _HASSFEST_TEMPLATE.format(
+                dockerfile_syntax=_DOCKERFILE_SYNTAX_SHA,
+            ),
             config.root / "script/hassfest/docker/Dockerfile",
         ),
     ]

script/hassfest/docker/Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
 # Automatically generated by hassfest.
 #
 # To update, run python3 -m script.hassfest -p docker