Merge pull request #3584 from afbjorklund/podman-1.0

Podman 1.0.0
kubernetes · Jan 25, 2019 · 0d02609 · 0d02609
2 parents 31eb53c + 2caf997
commit 0d02609
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git 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
@@ -0,0 +1,5 @@
+[registries.search]
+registries = ['docker.io']
+
+[registries.insecure]
+registries = []
diff --git a/deploy/iso/minikube-iso/package/podman/podman.hash b/deploy/iso/minikube-iso/package/podman/podman.hash
@@ -1 +1,5 @@
 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
+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
@@ -1,5 +1,6 @@
-PODMAN_VERSION = v0.4.1
-PODMAN_SITE = https://github.com/projectatomic/libpod/archive
+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
 PODMAN_LICENSE_FILES = LICENSE
@@ -15,14 +16,16 @@ 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
 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