From 8d5cff535636e1b63ac0ac411349d657d5a12a90 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 6 Oct 2023 15:56:23 -0700 Subject: [PATCH] ISO: Add docker-buildx --- .../arch/aarch64/package/Config.in | 1 + .../package/docker-buildx-aarch64/Config.in | 4 ++++ .../docker-buildx-aarch64/docker-buildx.hash | 1 + .../docker-buildx-aarch64/docker-buildx.mk | 19 +++++++++++++++++++ .../arch/x86_64/package/Config.in | 1 + .../x86_64/package/docker-buildx/Config.in | 4 ++++ .../package/docker-buildx/docker-buildx.hash | 1 + .../package/docker-buildx/docker-buildx.mk | 19 +++++++++++++++++++ hack/update/get_version/get_version.go | 1 + 9 files changed, 51 insertions(+) create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/Config.in create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/Config.in create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in index 34ea61ebb57d..2b7c10f76adc 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in @@ -6,4 +6,5 @@ menu "System tools aarch64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/nerdctl-bin-aarch64/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-buildx-aarch64/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/Config.in new file mode 100644 index 000000000000..cd460bba1fe1 --- /dev/null +++ b/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 diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash new file mode 100644 index 000000000000..e88889e562d6 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash @@ -0,0 +1 @@ +sha256 565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815 buildx-v0.11.2.linux-arm64 diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk new file mode 100644 index 000000000000..e9cbc02db64f --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# docker-buildx +# +################################################################################ + +DOCKER_BUILDX_AARCH64_VERSION = v0.11.2 +DOCKER_BUILDX_AARCH64_COMMIT = 9872040b6626fb7d87ef7296fd5b832e8cc2ad17 + +define DOCKER_BUILDX_AARCH64_CONFIGURE_CMDS + mkdir -p $(TARGET_DIR)/usr/libexec/docker/cli-plugins +endef + +define DOCKER_BUILDX_AARCH64_INSTALL_TARGET_CMDS + curl -Lo $(TARGET_DIR)/usr/libexec/docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/$(DOCKER_BUILDX_AARCH64_VERSION)/buildx-$(DOCKER_BUILDX_AARCH64_VERSION).linux-arm64 + chmod 0755 $(TARGET_DIR)/usr/libexec/docker/cli-plugins/docker-buildx +endef + +$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index edf19a81f6db..3c12dda090a1 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -6,6 +6,7 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/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/vbox-mount-service/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/Config.in new file mode 100644 index 000000000000..fe34adf1f482 --- /dev/null +++ b/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 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash new file mode 100644 index 000000000000..67b1bc5f7c6c --- /dev/null +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash @@ -0,0 +1 @@ +sha256 311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7 buildx-v0.11.2.linux-amd64 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk new file mode 100644 index 000000000000..e137e599239a --- /dev/null +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# docker-buildx +# +################################################################################ + +DOCKER_BUILDX_VERSION = v0.11.2 +DOCKER_BUILDX_COMMIT = 9872040b6626fb7d87ef7296fd5b832e8cc2ad17 + +define DOCKER_BUILDX_CONFIGURE_CMDS + mkdir -p $(TARGET_DIR)/usr/libexec/docker/cli-plugins +endef + +define DOCKER_BUILDX_INSTALL_TARGET_CMDS + curl -Lo $(TARGET_DIR)/usr/libexec/docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/$(DOCKER_BUILDX_VERSION)/buildx-$(DOCKER_BUILDX_VERSION).linux-amd64 + chmod 0755 $(TARGET_DIR)/usr/libexec/docker/cli-plugins/docker-buildx +endef + +$(eval $(generic-package)) diff --git a/hack/update/get_version/get_version.go b/hack/update/get_version/get_version.go index 1992f1733890..b7fbbe097606 100644 --- a/hack/update/get_version/get_version.go +++ b/hack/update/get_version/get_version.go @@ -38,6 +38,7 @@ var dependencies = map[string]dependency{ "cri-dockerd": {"deploy/kicbase/Dockerfile", `CRI_DOCKERD_VERSION="(.*)"`}, "cri-o": {"deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk", `CRIO_BIN_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="(.*)"`},