Skip to content

Commit daa6a7c

Browse files
authored
Use matching version of DinD daemon when creating hassio data partition (#4344)
Use the version used in the docker-engine package to ensure it stays in sync. Although we haven't seen any issues related to the fact it was sometimes mismatching, reduce the burden of needing it to be synced manually.
1 parent 2e48a0a commit daa6a7c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

buildroot-external/package/hassio/create-data-partition.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set -e
44
build_dir=$1
55
dst_dir=$2
66
channel=$3
7+
docker_version=$4
78

89
data_img="${dst_dir}/data.ext4"
910

@@ -17,13 +18,12 @@ mkdir -p "${build_dir}/data/"
1718
sudo mount -o loop,discard "${data_img}" "${build_dir}/data/"
1819

1920
# Use official Docker in Docker images
20-
# Ideally we use the same version as Buildroot is using in case the
21-
# overlayfs2 storage format changes
21+
# We use the same version as Buildroot is using to ensure best compatibility
2222
container=$(docker run --privileged -e DOCKER_TLS_CERTDIR="" \
2323
-v "${build_dir}/data/":/data \
2424
-v "${build_dir}/data/docker/":/var/lib/docker \
2525
-v "${build_dir}":/build \
26-
-d docker:28.0-dind --storage-driver overlay2)
26+
-d "docker:${docker_version}-dind" --storage-driver overlay2)
2727

2828
docker exec "${container}" sh /build/dind-import-containers.sh "${channel}"
2929

buildroot-external/package/hassio/hassio.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ endef
3737
HASSIO_INSTALL_IMAGES = YES
3838

3939
define HASSIO_INSTALL_IMAGES_CMDS
40-
$(BR2_EXTERNAL_HASSOS_PATH)/package/hassio/create-data-partition.sh "$(@D)" "$(BINARIES_DIR)" "$(HASSIO_VERSION_CHANNEL)"
40+
$(BR2_EXTERNAL_HASSOS_PATH)/package/hassio/create-data-partition.sh "$(@D)" "$(BINARIES_DIR)" "$(HASSIO_VERSION_CHANNEL)" "$(DOCKER_ENGINE_VERSION)"
4141
endef
4242

4343
$(eval $(generic-package))

0 commit comments

Comments
 (0)