From 3fe495fb7e633a8da64cfc0e210c5183a7880ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Thu, 20 Jun 2019 18:10:15 +0200 Subject: [PATCH 1/3] Upgrade podman to 1.4.1 --- deploy/iso/minikube-iso/package/podman/podman.hash | 2 ++ deploy/iso/minikube-iso/package/podman/podman.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/podman/podman.hash b/deploy/iso/minikube-iso/package/podman/podman.hash index 7f270bdbb3..08a3534fce 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.hash +++ b/deploy/iso/minikube-iso/package/podman/podman.hash @@ -6,3 +6,5 @@ sha256 f7a462563dd587208eff3c3c0689bc4d01071a8f7933bec2a13126be123f63a8 v1.0.0.t sha256 b4d6843e13c0f2f1557ab20b4364bb42ea9102442ee3f1be806c06128aa687d8 v1.2.0.tar.gz sha256 548a82b62ff183ca9e68f164779d6ded94fce07261242ceb96faa267fcecf56b v1.3.0.tar.gz sha256 7ccbfa80900cd438468986911038da4c38382ef507a2fa717217faefb738fbc4 v1.3.1.tar.gz +sha256 17fdf68e85106d0848e89825e191198a4079bb6d9ca6dd3e415e5c010192db9e v1.4.0.tar.gz +sha256 45eb7bccd81a1431b0c7a0697829c0bcc397048595d143fd91179b31d22a3c63 v1.4.1.tar.gz diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 5ee095a225..093b454e7d 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 = v1.3.1 -PODMAN_COMMIT = 7210727e205c333af9a2d0ed0bb66adcf92a6369 +PODMAN_VERSION = v1.4.1 +PODMAN_COMMIT = c4b52f47ba890ae219db62695e4ca342c5d20dd5 PODMAN_SITE = https://github.com/containers/libpod/archive PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz PODMAN_LICENSE = Apache-2.0 From 92e9a41fc9cad91a5f8fff981264e37c4301efb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Mon, 24 Jun 2019 07:53:05 +0200 Subject: [PATCH 2/3] Upgrade conmon version for podman --- .../package/conmon-master/conmon-master.hash | 2 ++ .../minikube-iso/package/conmon-master/conmon-master.mk | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/conmon-master/conmon-master.hash b/deploy/iso/minikube-iso/package/conmon-master/conmon-master.hash index cc13eb0cc8..14ed1bd8e9 100644 --- a/deploy/iso/minikube-iso/package/conmon-master/conmon-master.hash +++ b/deploy/iso/minikube-iso/package/conmon-master/conmon-master.hash @@ -1 +1,3 @@ +# Locally computed sha256 4f978a59c6ee516f7e3febfb3b0360a17d1be2c283313e1aeb27adcb8c8f9166 dde3ccf93f01ce5a3e0f7a2c97053697cc3ed152.tar.gz +sha256 75fad6e66b43c5039719edbd82ba072723aea6a9d4d8be4e7ac1c245a291ab1b 8455ce1ef385120deb827d0f0588c04357bad4c4.tar.gz diff --git a/deploy/iso/minikube-iso/package/conmon-master/conmon-master.mk b/deploy/iso/minikube-iso/package/conmon-master/conmon-master.mk index 0586253f1c..17bca7e61e 100644 --- a/deploy/iso/minikube-iso/package/conmon-master/conmon-master.mk +++ b/deploy/iso/minikube-iso/package/conmon-master/conmon-master.mk @@ -1,4 +1,11 @@ -CONMON_MASTER_VERSION = dde3ccf93f01ce5a3e0f7a2c97053697cc3ed152 +################################################################################ +# +# conmon +# +################################################################################ + +# HEAD as of 2019-06-13 +CONMON_MASTER_VERSION = 8455ce1ef385120deb827d0f0588c04357bad4c4 CONMON_MASTER_SITE = https://github.com/containers/conmon/archive CONMON_MASTER_SOURCE = $(CONMON_MASTER_VERSION).tar.gz CONMON_MASTER_LICENSE = Apache-2.0 From 1548723067b1dd32ee872f6f1320acaec4d39a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Mon, 8 Jul 2019 23:00:12 +0200 Subject: [PATCH 3/3] Upgrade podman to 1.4.4 --- deploy/iso/minikube-iso/package/podman/podman.hash | 1 + deploy/iso/minikube-iso/package/podman/podman.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/podman/podman.hash b/deploy/iso/minikube-iso/package/podman/podman.hash index 08a3534fce..2a11dc7028 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.hash +++ b/deploy/iso/minikube-iso/package/podman/podman.hash @@ -8,3 +8,4 @@ sha256 548a82b62ff183ca9e68f164779d6ded94fce07261242ceb96faa267fcecf56b v1.3.0.t sha256 7ccbfa80900cd438468986911038da4c38382ef507a2fa717217faefb738fbc4 v1.3.1.tar.gz sha256 17fdf68e85106d0848e89825e191198a4079bb6d9ca6dd3e415e5c010192db9e v1.4.0.tar.gz sha256 45eb7bccd81a1431b0c7a0697829c0bcc397048595d143fd91179b31d22a3c63 v1.4.1.tar.gz +sha256 2e027c1b935f3a03f27ef7f17823ccf334607a17d033d4ce53a90b98294e7f68 v1.4.4.tar.gz diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 093b454e7d..7286736598 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 = v1.4.1 -PODMAN_COMMIT = c4b52f47ba890ae219db62695e4ca342c5d20dd5 +PODMAN_VERSION = v1.4.4 +PODMAN_COMMIT = b3f10c8be229bcc58c1673b0431285fd5fce1293 PODMAN_SITE = https://github.com/containers/libpod/archive PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz PODMAN_LICENSE = Apache-2.0