diff --git a/deploy/iso/minikube-iso/package/cni-plugins/Config.in b/deploy/iso/minikube-iso/package/cni-plugins/Config.in index cdca8f72dd..c6ff6cec4d 100644 --- a/deploy/iso/minikube-iso/package/cni-plugins/Config.in +++ b/deploy/iso/minikube-iso/package/cni-plugins/Config.in @@ -1,5 +1,4 @@ config BR2_PACKAGE_CNI_PLUGINS bool "cni-plugins" default y - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS diff --git a/deploy/iso/minikube-iso/package/cni/Config.in b/deploy/iso/minikube-iso/package/cni/Config.in index b711219701..dd6c4fcd39 100644 --- a/deploy/iso/minikube-iso/package/cni/Config.in +++ b/deploy/iso/minikube-iso/package/cni/Config.in @@ -1,5 +1,4 @@ config BR2_PACKAGE_CNI bool "cni" default y - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS diff --git a/deploy/iso/minikube-iso/package/containerd-bin/Config.in b/deploy/iso/minikube-iso/package/containerd-bin/Config.in index fc5f328248..f870840997 100644 --- a/deploy/iso/minikube-iso/package/containerd-bin/Config.in +++ b/deploy/iso/minikube-iso/package/containerd-bin/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_CONTAINERD_BIN bool "containerd-bin" default y - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/Config.in b/deploy/iso/minikube-iso/package/cri-dockerd/Config.in index 460971d045..57d2e21825 100644 --- a/deploy/iso/minikube-iso/package/cri-dockerd/Config.in +++ b/deploy/iso/minikube-iso/package/cri-dockerd/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_CRI_DOCKERD bool "cri-dockerd" default y - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/deploy/iso/minikube-iso/package/crictl-bin-aarch64/Config.in b/deploy/iso/minikube-iso/package/crictl-bin-aarch64/Config.in new file mode 100644 index 0000000000..495e34ea08 --- /dev/null +++ b/deploy/iso/minikube-iso/package/crictl-bin-aarch64/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_CRICTL_BIN + bool "crictl-bin" + default y + depends on BR2_aarch64 diff --git a/deploy/iso/minikube-iso/package/crictl-bin-aarch64/crictl-bin.hash b/deploy/iso/minikube-iso/package/crictl-bin-aarch64/crictl-bin.hash new file mode 100644 index 0000000000..e66af8bf7a --- /dev/null +++ b/deploy/iso/minikube-iso/package/crictl-bin-aarch64/crictl-bin.hash @@ -0,0 +1 @@ +sha256 454eecd29fe636282339af5b73c60234a7d10e4b11b9e18937e33056763d72cf crictl-v1.21.0-linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/package/crictl-bin-aarch64/crictl-bin.mk b/deploy/iso/minikube-iso/package/crictl-bin-aarch64/crictl-bin.mk new file mode 100644 index 0000000000..8078f88b1f --- /dev/null +++ b/deploy/iso/minikube-iso/package/crictl-bin-aarch64/crictl-bin.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# crictl-bin +# +################################################################################ + +CRICTL_BIN_VERSION = v1.21.0 +CRICTL_BIN_SITE = https://github.com/kubernetes-sigs/cri-tools/releases/download/$(CRICTL_BIN_VERSION) +CRICTL_BIN_SOURCE = crictl-$(CRICTL_BIN_VERSION)-linux-arm64.tar.gz +CRICTL_BIN_STRIP_COMPONENTS = 0 + +define CRICTL_BIN_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 \ + $(@D)/crictl \ + $(TARGET_DIR)/usr/bin/crictl +endef + +$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/package/crio-bin/Config.in b/deploy/iso/minikube-iso/package/crio-bin/Config.in index 68b666cdc5..a933e5cda8 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/Config.in +++ b/deploy/iso/minikube-iso/package/crio-bin/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_CRIO_BIN bool "crio-bin" default y - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/deploy/iso/minikube-iso/package/docker-bin-aarch64/Config.in b/deploy/iso/minikube-iso/package/docker-bin-aarch64/Config.in new file mode 100644 index 0000000000..c81f647c9a --- /dev/null +++ b/deploy/iso/minikube-iso/package/docker-bin-aarch64/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_DOCKER_BIN + bool "docker-bin" + default y + depends on BR2_aarch64 diff --git a/deploy/iso/minikube-iso/package/docker-bin/daemon.json b/deploy/iso/minikube-iso/package/docker-bin-aarch64/daemon.json similarity index 100% rename from deploy/iso/minikube-iso/package/docker-bin/daemon.json rename to deploy/iso/minikube-iso/package/docker-bin-aarch64/daemon.json diff --git a/deploy/iso/minikube-iso/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/package/docker-bin-aarch64/docker-bin.hash new file mode 100644 index 0000000000..84b6060930 --- /dev/null +++ b/deploy/iso/minikube-iso/package/docker-bin-aarch64/docker-bin.hash @@ -0,0 +1 @@ +sha256 ea971edc1179088bfd25edd04a0c12848143d15cb8202ebb93a6a08973464fd0 docker-20.10.14.tgz diff --git a/deploy/iso/minikube-iso/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/package/docker-bin-aarch64/docker-bin.mk new file mode 100644 index 0000000000..134b2cd844 --- /dev/null +++ b/deploy/iso/minikube-iso/package/docker-bin-aarch64/docker-bin.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# docker-bin +# +################################################################################ + +DOCKER_BIN_VERSION = 20.10.14 +DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/aarch64 +DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz + +define DOCKER_BIN_USERS + - -1 docker -1 - - - - - +endef + +define DOCKER_BIN_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 \ + $(@D)/docker \ + $(TARGET_DIR)/bin/docker + + # As of 2019-05, we use upstream containerd so that we may update it independently of docker. + + # As of 2019-01, we use upstream runc so that we may update it independently of docker. + + # As of 2019-05, we use upstream ctr so that we may update it independently of docker. + + $(INSTALL) -D -m 0755 \ + $(@D)/dockerd \ + $(TARGET_DIR)/bin/dockerd + + $(INSTALL) -D -m 0755 \ + $(@D)/docker-init \ + $(TARGET_DIR)/bin/docker-init + + $(INSTALL) -D -m 0755 \ + $(@D)/docker-proxy \ + $(TARGET_DIR)/bin/docker-proxy + + # https://kubernetes.io/docs/setup/production-environment/container-runtimes/#docker + + $(INSTALL) -Dm644 \ + $(DOCKER_BIN_PKGDIR)/daemon.json \ + $(TARGET_DIR)/etc/docker/daemon.json +endef + +define DOCKER_BIN_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 \ + $(BR2_EXTERNAL)/package/docker-bin/docker.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/docker.socket + + $(INSTALL) -D -m 644 \ + $(DOCKER_BIN_PKGDIR)/forward.conf \ + $(TARGET_DIR)/etc/sysctl.d/forward.conf +endef + +$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/package/docker-bin/docker.socket b/deploy/iso/minikube-iso/package/docker-bin-aarch64/docker.socket similarity index 100% rename from deploy/iso/minikube-iso/package/docker-bin/docker.socket rename to deploy/iso/minikube-iso/package/docker-bin-aarch64/docker.socket diff --git a/deploy/iso/minikube-iso/package/docker-bin/forward.conf b/deploy/iso/minikube-iso/package/docker-bin-aarch64/forward.conf similarity index 100% rename from deploy/iso/minikube-iso/package/docker-bin/forward.conf rename to deploy/iso/minikube-iso/package/docker-bin-aarch64/forward.conf diff --git a/deploy/iso/minikube-iso/package/docker-bin/Config.in b/deploy/iso/minikube-iso/package/docker-bin-x86_64/Config.in similarity index 100% rename from deploy/iso/minikube-iso/package/docker-bin/Config.in rename to deploy/iso/minikube-iso/package/docker-bin-x86_64/Config.in diff --git a/deploy/iso/minikube-iso/package/docker-bin-x86_64/daemon.json b/deploy/iso/minikube-iso/package/docker-bin-x86_64/daemon.json new file mode 100644 index 0000000000..46c2107f11 --- /dev/null +++ b/deploy/iso/minikube-iso/package/docker-bin-x86_64/daemon.json @@ -0,0 +1,10 @@ +{ + "exec-opts": [ + "native.cgroupdriver=systemd" + ], + "log-driver": "json-file", + "log-opts": { + "max-size": "100m" + }, + "storage-driver": "overlay2" +} diff --git a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/package/docker-bin-x86_64/docker-bin.hash similarity index 100% rename from deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash rename to deploy/iso/minikube-iso/package/docker-bin-x86_64/docker-bin.hash diff --git a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/package/docker-bin-x86_64/docker-bin.mk similarity index 100% rename from deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk rename to deploy/iso/minikube-iso/package/docker-bin-x86_64/docker-bin.mk diff --git a/deploy/iso/minikube-iso/package/docker-bin-x86_64/docker.socket b/deploy/iso/minikube-iso/package/docker-bin-x86_64/docker.socket new file mode 100644 index 0000000000..7dd95098e4 --- /dev/null +++ b/deploy/iso/minikube-iso/package/docker-bin-x86_64/docker.socket @@ -0,0 +1,12 @@ +[Unit] +Description=Docker Socket for the API +PartOf=docker.service + +[Socket] +ListenStream=/var/run/docker.sock +SocketMode=0660 +SocketUser=root +SocketGroup=docker + +[Install] +WantedBy=sockets.target diff --git a/deploy/iso/minikube-iso/package/docker-bin-x86_64/forward.conf b/deploy/iso/minikube-iso/package/docker-bin-x86_64/forward.conf new file mode 100644 index 0000000000..250ee89118 --- /dev/null +++ b/deploy/iso/minikube-iso/package/docker-bin-x86_64/forward.conf @@ -0,0 +1,2 @@ +net.ipv4.ip_forward=1 + diff --git a/deploy/iso/minikube-iso/package/gluster/Config.in b/deploy/iso/minikube-iso/package/gluster/Config.in index 7d2515e177..cc5f3b5404 100644 --- a/deploy/iso/minikube-iso/package/gluster/Config.in +++ b/deploy/iso/minikube-iso/package/gluster/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_GLUSTER bool "gluster" default y - depends on BR2_x86_64 select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_LIBXML2 help diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in b/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in index 834b31bdcb..4a60df7850 100644 --- a/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/Config.in @@ -1,4 +1,3 @@ config BR2_PACKAGE_HYPERV_DAEMONS bool "hyperv-daemons" default y - depends on BR2_x86_64 diff --git a/deploy/iso/minikube-iso/package/podman/Config.in b/deploy/iso/minikube-iso/package/podman/Config.in index fbd71c5e13..db2942d134 100644 --- a/deploy/iso/minikube-iso/package/podman/Config.in +++ b/deploy/iso/minikube-iso/package/podman/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PODMAN bool "podman" default y - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS