ISO: Add docker-buildx

.github/workflows/update-iso-image-versions.yml

@@ -21,10 +21,11 @@ jobs:
  OLD_BUILDKIT=$(DEP=buildkit make get-dependency-version)
  OLD_CNI_PLUGINS=$(DEP=cni-plugins make get-dependency-version)
  OLD_CONTAINERD=$(DEP=containerd make get-dependency-version)
- OLD_CRIO=$(DEP=cri-o make get-dependency-version)
  OLD_CRICTL=$(DEP=crictl make get-dependency-version)
+ OLD_CRIO=$(DEP=cri-o make get-dependency-version)
  OLD_CRUN=$(DEP=crun make get-dependency-version)
  OLD_DOCKER=$(DEP=docker make get-dependency-version)
+ OLD_DOCKER_BUILDX=$(DEP=docker-buildx make get-dependency-version)
  OLD_GO=$(DEP=go make get-dependency-version)
  OLD_NERDCTL=$(DEP=nerdctl make get-dependency-version)
  OLD_NERDCTLD=$(DEP=nerdctld make get-dependency-version)
@@ -38,6 +39,7 @@ jobs:
  # make update-crictl-version
  make update-crun-version
  make update-docker-version
+ make update-docker-buildx-version
  make update-golang-version
  make update-nerdctl-version
  make update-nerdctld-version
@@ -46,10 +48,11 @@ jobs:
  NEW_BUILDKIT=$(DEP=buildkit make get-dependency-version)
  NEW_CNI_PLUGINS=$(DEP=cni-plugins make get-dependency-version)
  NEW_CONTAINERD=$(DEP=containerd make get-dependency-version)
- NEW_CRIO=$(DEP=cri-o make get-dependency-version)
  NEW_CRICTL=$(DEP=crictl make get-dependency-version)
+ NEW_CRIO=$(DEP=cri-o make get-dependency-version)
  NEW_CRUN=$(DEP=crun make get-dependency-version)
  NEW_DOCKER=$(DEP=docker make get-dependency-version)
+ NEW_DOCKER_BUILDX=$(DEP=docker-buildx make get-dependency-version)
  NEW_GO=$(DEP=go make get-dependency-version)
  NEW_NERDCTL=$(DEP=nerdctl make get-dependency-version)
  NEW_NERDCTLD=$(DEP=nerdctld make get-dependency-version)
@@ -68,14 +71,14 @@ jobs:
  echo "### Update containerd from $OLD_CONTAINERD to $NEW_CONTAINERD" >> "$GITHUB_OUTPUT"
  echo "[Release notes](https://github.com/containerd/containerd/releases)" >> "$GITHUB_OUTPUT"
  fi
- if [ "$OLD_CRIO" != "$NEW_CRIO" ]; then
- echo "### Update CRI-O from $OLD_CRIO to $NEW_CRIO" >> "$GITHUB_OUTPUT"
- echo "[Release notes](https://github.com/cri-o/cri-o/releases)" >> "$GITHUB_OUTPUT"
- fi
  if [ "$OLD_CRICTL" != "$NEW_CRICTL" ]; then
  echo "### Update crictl from $OLD_CRICTL to $NEW_CRICTL" >> "$GITHUB_OUTPUT"
  echo "[Release notes](https://github.com/kubernetes-sigs/cri-tools/releases)" >> "$GITHUB_OUTPUT"
  fi
+ if [ "$OLD_CRIO" != "$NEW_CRIO" ]; then
+ echo "### Update CRI-O from $OLD_CRIO to $NEW_CRIO" >> "$GITHUB_OUTPUT"
+ echo "[Release notes](https://github.com/cri-o/cri-o/releases)" >> "$GITHUB_OUTPUT"
+ fi
  if [ "$OLD_CRUN" != "$NEW_CRUN" ]; then
  echo "### Update crun from $OLD_CRUN to $NEW_CRUN" >> "$GITHUB_OUTPUT"
  echo "[Release notes](https://github.com/containers/crun/releases)" >> "$GITHUB_OUTPUT"
@@ -84,6 +87,10 @@ jobs:
  echo "### Update Docker from $OLD_DOCKER to $NEW_DOCKER" >> "$GITHUB_OUTPUT"
  echo "[Release notes](https://github.com/moby/moby/releases)" >> "$GITHUB_OUTPUT"
  fi
+ if [ "$OLD_DOCKER_BUILDX" != "$NEW_DOCKER_BUILDX" ]; then
+ echo "### Update buildx from $OLD_DOCKER_BUILDX to $NEW_DOCKER_BUILDX" >> "$GITHUB_OUTPUT"
+ echo "[Release notes](https://github.com/docker/buildx/releases)" >> "$GITHUB_OUTPUT"
+ fi
  if [ "$OLD_GO" != "$NEW_GO" ]; then
  echo "### Update Go from $OLD_GO to $NEW_GO" >> "$GITHUB_OUTPUT"
  fi

deploy/iso/minikube-iso/arch/aarch64/package/Config.in

@@ -1,9 +1,10 @@
 menu "System tools aarch64"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/buildkit-bin-aarch64/Config.in"
+ source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-latest-aarch64/Config.in"
+ source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in"
- source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-latest-aarch64/Config.in"
- source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in"
+ source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-buildx-aarch64/Config.in"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/nerdctl-bin-aarch64/Config.in"
 endmenu

deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/Config.in

@@ -0,0 +1,4 @@
+config BR2_PACKAGE_DOCKER_BUILDX_AARCH64
+ bool "docker-buildx"
+ default y
+ depends on BR2_aarch64

deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash

@@ -0,0 +1 @@
+sha256 3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489 buildx-v0.13.1.linux-arm64

deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk

@@ -0,0 +1,37 @@
+################################################################################
+#
+# docker-buildx
+#
+################################################################################
+
+DOCKER_BUILDX_AARCH64_VERSION = v0.13.1
+DOCKER_BUILDX_AARCH64_COMMIT = 788433953af10f2a698f5c07611dddce2e08c7a0
+DOCKER_BUILDX_AARCH64_SITE = https://github.com/docker/buildx/archive
+DOCKER_BUILDX_AARCH64_SOURCE = $(DOCKER_BUILDX_AARCH64_VERSION).tar.gz
+DOCKER_BUILDX_AARCH64_GOPATH = $(@D)/_output
+DOCKER_BUILDX_AARCH64_ENV = \
+ $(GO_TARGET_ENV) \
+ CGO_ENABLED=1 \
+ GO111MODULE=off \
+ GOPATH="$(DOCKER_BUILDX_AARCH64_GOPATH)" \
+ GOBIN="$(DOCKER_BUILDX_AARCH64_GOPATH)/bin" \
+ PATH=$(DOCKER_BUILDX_AARCH64_GOPATH)/bin:$(BR_PATH) \
+ GOARCH=arm64
+
+DOCKER_BUILDX_AARCH64_COMPILE_SRC = $(DOCKER_BUILDX_AARCH64_GOPATH)/src/github.com/docker/buildx
+
+define DOCKER_BUILDX_AARCH64_CONFIGURE_CMDS
+ mkdir -p $(TARGET_DIR)/usr/libexec/docker/cli-plugins
+endef
+
+define DOCKER_BUILDX_AARCH64_BUILD_CMDS
+ PWD=$(DOCKER_BUILDX_AARCH64_COMPILE_SRC) $(DOCKER_BUILDX_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) VERSION=$(DOCKER_BUILDX_AARCH64_VERSION) REVISION=$(DOCKER_BUILDX_AARCH64_COMMIT) -C $(@D) build
+endef
+
+define DOCKER_BUILDX_AARCH64_INSTALL_TARGET_CMDS
+ $(INSTALL) -Dm755 \
+ $(@D)/bin/build/docker-buildx \
+ $(TARGET_DIR)/usr/libexec/docker/cli-plugins/docker-buildx
+endef
+
+$(eval $(generic-package))

deploy/iso/minikube-iso/arch/x86_64/package/Config.in

@@ -1,11 +1,12 @@
 menu "System tools x86_64"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/buildkit-bin/Config.in"
+ source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins-latest/Config.in"
+ source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in"
- source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins-latest/Config.in"
- source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in"
- source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/nerdctl-bin/Config.in"
+ source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-buildx/Config.in"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/hyperv-daemons/Config.in"
+ source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/nerdctl-bin/Config.in"
  source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/vbox-mount-service/Config.in"
 endmenu

deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/Config.in

@@ -0,0 +1,4 @@
+config BR2_PACKAGE_DOCKER_BUILDX
+ bool "docker-buildx"
+ default y
+ depends on BR2_x86_64

deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash

@@ -0,0 +1 @@
+sha256 3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c buildx-v0.13.1.linux-amd64

deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk

@@ -0,0 +1,37 @@
+################################################################################
+# 
+# docker-buildx
+# 
+################################################################################
+
+DOCKER_BUILDX_VERSION = v0.13.1
+DOCKER_BUILDX_COMMIT = 788433953af10f2a698f5c07611dddce2e08c7a0
+DOCKER_BUILDX_SITE = https://github.com/docker/buildx/archive
+DOCKER_BUILDX_SOURCE = $(DOCKER_BUILDX_VERSION).tar.gz
+DOCKER_BUILDX_GOPATH = $(@D)/_output
+DOCKER_BUILDX_ENV = \
+ $(GO_TARGET_ENV) \
+ CGO_ENABLED=1 \
+ GO111MODULE=off \
+ GOPATH="$(DOCKER_BUILDX_GOPATH)" \
+ GOBIN="$(DOCKER_BUILDX_GOPATH)/bin" \
+ PATH=$(DOCKER_BUILDX_GOPATH)/bin:$(BR_PATH) \
+ GOARCH=amd64
+
+DOCKER_BUILDX_COMPILE_SRC = $(DOCKER_BUILDX_GOPATH)/src/github.com/docker/buildx
+
+define DOCKER_BUILDX_CONFIGURE_CMDS
+ mkdir -p $(TARGET_DIR)/usr/libexec/docker/cli-plugins
+endef
+
+define DOCKER_BUILDX_BUILD_CMDS
+ PWD=$(DOCKER_BUILDX_COMPILE_SRC) $(DOCKER_BUILDX_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) VERSION=$(DOCKER_BUILDX_VERSION) REVISION=$(DOCKER_BUILDX_COMMIT) -C $(@D) build
+endef
+
+define DOCKER_BUILDX_INSTALL_TARGET_CMDS
+ $(INSTALL) -Dm755 \
+ $(@D)/bin/build/docker-buildx \
+ $(TARGET_DIR)/usr/libexec/docker/cli-plugins/docker-buildx
+endef
+
+$(eval $(generic-package))

hack/update/get_version/get_version.go

@@ -43,6 +43,7 @@ var dependencies = map[string]dependency{
  "crictl": {"deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.mk", `CRICTL_BIN_VERSION = (.*)`},
  "crun": {"deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk", `CRUN_LATEST_VERSION = (.*)`},
  "docker": {"deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk", `DOCKER_BIN_VERSION = (.*)`},
+ "docker-buildx": {"deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk", `DOCKER_BUILDX_VERSION = (.*)`},
  "flannel": {"pkg/minikube/cni/flannel.yaml", `flannel:(.*)`},
  "gcp-auth": {addonsFile, `k8s-minikube/gcp-auth-webhook:(.*)@`},
  "gh": {"hack/jenkins/installers/check_install_gh.sh", `GH_VERSION="(.*)"`},