From 2aa4927e7829a76286a67404c70d616e3b18f3e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 21 Apr 2018 21:13:39 +0200 Subject: [PATCH 1/5] Add basic registries.conf for docker.io registry --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 3 +++ deploy/iso/minikube-iso/package/crio-bin/registries.conf | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 deploy/iso/minikube-iso/package/crio-bin/registries.conf diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index 3ba7196f5f3d..0506b65b4ce5 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -54,6 +54,9 @@ define CRIO_BIN_INSTALL_TARGET_CMDS $(INSTALL) -Dm644 \ $(BR2_EXTERNAL_MINIKUBE_PATH)/package/crio-bin/policy.json \ $(TARGET_DIR)/etc/containers/policy.json + $(INSTALL) -Dm644 \ + $(BR2_EXTERNAL_MINIKUBE_PATH)/package/crio-bin/registries.conf \ + $(TARGET_DIR)/etc/containers/registries.conf mkdir -p $(TARGET_DIR)/etc/sysconfig echo 'CRIO_OPTIONS="--log-level=debug"' > $(TARGET_DIR)/etc/sysconfig/crio diff --git a/deploy/iso/minikube-iso/package/crio-bin/registries.conf b/deploy/iso/minikube-iso/package/crio-bin/registries.conf new file mode 100644 index 000000000000..409f31d8969f --- /dev/null +++ b/deploy/iso/minikube-iso/package/crio-bin/registries.conf @@ -0,0 +1,5 @@ +[registries.search] +registries = ['docker.io'] + +[registries.insecure] +registries = [] From 5a7e216caf06c030b8f698380d1b15aae895ce63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 29 Jul 2018 12:59:54 +0200 Subject: [PATCH 2/5] Upgrade podman to 0.9.3 --- deploy/iso/minikube-iso/package/podman/podman.hash | 3 +++ deploy/iso/minikube-iso/package/podman/podman.mk | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/podman/podman.hash b/deploy/iso/minikube-iso/package/podman/podman.hash index e83aaade90fb..e3b0dbf9c09c 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.hash +++ b/deploy/iso/minikube-iso/package/podman/podman.hash @@ -1 +1,4 @@ sha256 8f71046aa2ad9e380d1f50a800a8e5cc9801bf645a2831712378742282a0a36a v0.4.1.tar.gz +sha256 004d2695cf3de1802b3a1fc70bb03115e33ffe943477c49558b682313cb4fca2 v0.6.1.tar.gz +sha256 0b478f4918b984480b2f24ac5df1f45e31bca798dd8e2364bb56b2810b2ccff6 v0.7.4.tar.gz +sha256 065d2ef4cbbbcb87a7be5e1b3adb36d932819bafae7ccc26ad80f653b4328692 v0.9.3.tar.gz diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 555292bd89e8..b7139766a2c3 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.mk +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -1,4 +1,4 @@ -PODMAN_VERSION = v0.4.1 +PODMAN_VERSION = v0.9.3 PODMAN_SITE = https://github.com/projectatomic/libpod/archive PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz PODMAN_LICENSE = Apache-2.0 @@ -17,6 +17,8 @@ PODMAN_BIN_ENV = \ define PODMAN_CONFIGURE_CMDS mkdir -p $(PODMAN_GOPATH)/src/github.com/projectatomic ln -sf $(@D) $(PODMAN_GOPATH)/src/github.com/projectatomic/libpod + mkdir -p $(PODMAN_GOPATH)/src/github.com/varlink + ln -sf $(@D)/vendor/github.com/varlink/go $(PODMAN_GOPATH)/src/github.com/varlink/go $(PODMAN_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install.tools DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr endef From 18097177fd1bdf46ac567881ce72892ad0015d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 22 Sep 2018 17:32:46 +0200 Subject: [PATCH 3/5] The podman github project has moved From "projectatomic" to "containers" --- deploy/iso/minikube-iso/package/podman/podman.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index b7139766a2c3..4e4453a4ad78 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.mk +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -1,5 +1,5 @@ PODMAN_VERSION = v0.9.3 -PODMAN_SITE = https://github.com/projectatomic/libpod/archive +PODMAN_SITE = https://github.com/containers/libpod/archive PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz PODMAN_LICENSE = Apache-2.0 PODMAN_LICENSE_FILES = LICENSE @@ -15,8 +15,8 @@ PODMAN_BIN_ENV = \ define PODMAN_CONFIGURE_CMDS - mkdir -p $(PODMAN_GOPATH)/src/github.com/projectatomic - ln -sf $(@D) $(PODMAN_GOPATH)/src/github.com/projectatomic/libpod + mkdir -p $(PODMAN_GOPATH)/src/github.com/containers + ln -sf $(@D) $(PODMAN_GOPATH)/src/github.com/containers/libpod mkdir -p $(PODMAN_GOPATH)/src/github.com/varlink ln -sf $(@D)/vendor/github.com/varlink/go $(PODMAN_GOPATH)/src/github.com/varlink/go $(PODMAN_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install.tools DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr From 43eeaea420c6cdc468dc396eb7032458a8a001bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Wed, 23 Jan 2019 20:14:06 +0100 Subject: [PATCH 4/5] Upgrade podman to 1.0.0 --- deploy/iso/minikube-iso/package/podman/podman.hash | 1 + deploy/iso/minikube-iso/package/podman/podman.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/podman/podman.hash b/deploy/iso/minikube-iso/package/podman/podman.hash index e3b0dbf9c09c..cc41e16d7699 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.hash +++ b/deploy/iso/minikube-iso/package/podman/podman.hash @@ -2,3 +2,4 @@ sha256 8f71046aa2ad9e380d1f50a800a8e5cc9801bf645a2831712378742282a0a36a v0.4.1.t sha256 004d2695cf3de1802b3a1fc70bb03115e33ffe943477c49558b682313cb4fca2 v0.6.1.tar.gz sha256 0b478f4918b984480b2f24ac5df1f45e31bca798dd8e2364bb56b2810b2ccff6 v0.7.4.tar.gz sha256 065d2ef4cbbbcb87a7be5e1b3adb36d932819bafae7ccc26ad80f653b4328692 v0.9.3.tar.gz +sha256 f7a462563dd587208eff3c3c0689bc4d01071a8f7933bec2a13126be123f63a8 v1.0.0.tar.gz diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 4e4453a4ad78..9fb9623a390c 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.mk +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -1,4 +1,4 @@ -PODMAN_VERSION = v0.9.3 +PODMAN_VERSION = v1.0.0 PODMAN_SITE = https://github.com/containers/libpod/archive PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz PODMAN_LICENSE = Apache-2.0 From 2caf997fcb6be620bc9a2760625eaf7a4858e067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Wed, 23 Jan 2019 22:53:07 +0100 Subject: [PATCH 5/5] Make sure to use correct git commit, not buildroot --- deploy/iso/minikube-iso/package/podman/podman.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 9fb9623a390c..86addddc0ba9 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.mk +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -1,4 +1,5 @@ PODMAN_VERSION = v1.0.0 +PODMAN_COMMIT = 82e80110c3f2d8728745c47e340f3bee4d408846 PODMAN_SITE = https://github.com/containers/libpod/archive PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz PODMAN_LICENSE = Apache-2.0 @@ -24,7 +25,7 @@ endef define PODMAN_BUILD_CMDS mkdir -p $(@D)/bin - $(PODMAN_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr podman + $(PODMAN_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(PODMAN_COMMIT) PREFIX=/usr podman endef define PODMAN_INSTALL_TARGET_CMDS