Skip to contentSkip to conversation

podman: remove comment about runc

PATCH In review Stefan Agner 2 participants 6 messages Oct 6, 2019 – Oct 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 podman: remove comment about runc

From: Stefan Agner <[email protected]>

It seems that docker uses nowadays a rather vanilla version of runc, at the time of writing 1.0.0-rc8. This version has successfully tested with podman, hence remove the obsolete comment.

---
 recipes-containers/podman/podman_git.bb | 2 --
 1 file changed, 2 deletions(-)
recipes-containers/podman/podman_git.bb +0 -2
index 64e2672..db595a5 100644
@@ -113,8 +113,6 @@ FILES_${PN} += " \
     ${sysconfdir}/cni \
 "
 
-# Note that runc-opencontainers is the only currently tested
-# runc provider.
 RDEPENDS_${PN} += "conmon virtual/runc iptables cni skopeo"
 RRECOMMENDS_${PN} += "slirp4netns"
 RCONFLICTS_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/5 podman: bump to latest release 1.6.1

From: Stefan Agner <[email protected]>

Bump to latest podman release 1.6.1.

---
 recipes-containers/podman/podman_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-containers/podman/podman_git.bb +2 -2
index db595a5..a3529b1 100644
@@ -30,7 +30,7 @@ python __anonymous() {
         raise bb.parse.SkipRecipe(msg)
 }
 
-SRCREV = "00057929f5acfd98341964d85722383363376d52"
+SRCREV = "233d95f4f0a815f11d1c1ae9aba16781c4eb2700"
 SRC_URI = " \
     git://github.com/containers/libpod.git;branch=master \
 "
@@ -42,7 +42,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-PV = "1.5.1+git${SRCREV}"
+PV = "1.6.1+git${SRCREV}"
 
 PACKAGES =+ "${PN}-contrib"
 
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/5 skopeo: add default set of configuration files

In reply to Stefan Agner

From: Stefan Agner <[email protected]>

Add a default registries.conf and storage.conf. Those config files are used by several projects of the containers group like buildah or podman. Provide it as part of skopeo like the other distributions do.

---
 .../skopeo/files/registries.conf              |  25 ++++
 recipes-containers/skopeo/files/storage.conf  | 133 ++++++++++++++++++
 recipes-containers/skopeo/skopeo_git.bb       |   9 +-
 3 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 recipes-containers/skopeo/files/registries.conf
 create mode 100644 recipes-containers/skopeo/files/storage.conf
recipes-containers/skopeo/files/registries.conf new file +25 -0
new file mode 100644
index 0000000..ba6c3f6
@@ -0,0 +1,25 @@
+# This is a system-wide configuration file used to
+# keep track of registries for various container backends.
+# It adheres to TOML format and does not support recursive
+# lists of registries.
+
+# The default location for this configuration file is /etc/containers/registries.conf.
+
+# The only valid categories are: 'registries.search', 'registries.insecure', 
+# and 'registries.block'.
+
+[registries.search]
+registries = ['docker.io', 'registry.fedoraproject.org', 'quay.io', 'registry.access.redhat.com', 'registry.centos.org']
+
+# If you need to access insecure registries, add the registry's fully-qualified name.
+# An insecure registry is one that does not have a valid SSL certificate or only does HTTP.
+[registries.insecure]
+registries = []
+
+
+# If you need to block pull access from a registry, uncomment the section below
+# and add the registries fully-qualified name.
+#
+# Docker only
+[registries.block]
+registries = []
recipes-containers/skopeo/files/storage.conf new file +133 -0

133 lines not on this page · raw message

recipes-containers/skopeo/skopeo_git.bb +8 -1
index 82d3f23..f5a6231 100644
@@ -19,7 +19,11 @@ RDEPENDS_${PN} = " \
      libassuan \
 "
 
-SRC_URI = "git://github.com/containers/skopeo"
+SRC_URI = " \
+    git://github.com/containers/skopeo \
+    file://storage.conf \
+    file://registries.conf \
+"
 
 SRCREV = "1cf1e06582142c522543560f2bc6d6756696e8ad"
 PV = "v0.1.39-dev+git${SRCPV}"
@@ -68,6 +72,9 @@ do_install() {
 
 	install ${S}/src/import/skopeo ${D}/${sbindir}/
 	install ${S}/src/import/default-policy.json ${D}/${sysconfdir}/containers/policy.json
+
+	install ${WORKDIR}/storage.conf ${D}/${sysconfdir}/containers/storage.conf
+	install ${WORKDIR}/registries.conf ${D}/${sysconfdir}/containers/registries.conf
 }
 
 INSANE_SKIP_${PN} += "ldflags"
Signature · 1 line
2.20.1
#3 lore raw

PATCH 4/5 podman-compose: initial version

In reply to Stefan Agner

From: Stefan Agner <[email protected]>

Add podman-compose, a docker-compose implementation for podman. The current version is not feature complete, hence not all docker-compose file work.

---
 recipes-containers/podman-compose_0.1.5.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 recipes-containers/podman-compose_0.1.5.bb
recipes-containers/podman-compose_0.1.5.bb new file +15 -0
new file mode 100644
index 0000000..4015069
@@ -0,0 +1,15 @@
+DESCRIPTION = "An implementation of docker-compose with podman backend"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+inherit setuptools3 pypi
+
+SRC_URI = "git://github.com/containers/podman-compose.git"
+
+SRCREV = "f008986633879acf3f54848dabbf07cef8e9c68f"
+
+S = "${WORKDIR}/git"
+
+DEPENDS += "${PYTHON_PN}-pyyaml-native"
+
+RDEPENDS_${PN} += "${PYTHON_PN}-pyyaml"
Signature · 1 line
2.20.1
#4 lore raw

PATCH 5/5 fuse-overlayfs: add FUSE implementation of overlayfs

In reply to Stefan Agner

From: Stefan Agner <[email protected]>

Add recipe for the FUSE implementation of overlayfs. This is useful to improve startup time for podman rootless containers.

---
 .../fuse-overlayfs/fuse-overlayfs_0.6.4.bb        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb
recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb new file +15 -0
new file mode 100644
index 0000000..a8bbf0f
@@ -0,0 +1,15 @@
+SUMMARY = "FUSE implementation of overlayfs."
+DESCRIPTION = "An implementation of overlay+shiftfs in FUSE for rootless \
+containers."
+
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRCREV = "098d9ad79fdbb8538adde08628408aa32a8b4b17"
+SRC_URI = "git://github.com/containers/fuse-overlayfs.git;nobranch=1"
+
+DEPENDS = "fuse3"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
Signature · 1 line
2.20.1
#5 lore raw
In reply to Stefan Agner

All 5 patches in this series are now merged.

I'm still having some issues with the network and CNI .. but will have a closer look this week. There was no reason to hold these back based on those problems though.

Bruce

Quoted 33 lines · Stefan Agner

From: Stefan Agner <[email protected]>

It seems that docker uses nowadays a rather vanilla version of runc, at the time of writing 1.0.0-rc8. This version has successfully tested with podman, hence remove the obsolete comment.

---
 recipes-containers/podman/podman_git.bb | 2 --
 1 file changed, 2 deletions(-)
recipes-containers/podman/podman_git.bb +0 -3
index 64e2672..db595a5 100644
@@ -113,8 +113,6 @@ FILES_${PN} += " \
     ${sysconfdir}/cni \
 "
 
-# Note that runc-opencontainers is the only currently tested
-# runc provider.
 RDEPENDS_${PN} += "conmon virtual/runc iptables cni skopeo"
 RRECOMMENDS_${PN} += "slirp4netns"
 RCONFLICTS_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"
--

2.20.1

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II