diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-17 21:49:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-17 21:49:10 +0200 |
| commit | 00ecbfc1315a62940202574fb45f2ae2f4c48b63 (patch) | |
| tree | 6a4c8c755c75d3ee215419dc21b8967f41c97be4 /README.md | |
| parent | ba612a098c65f11730e8436cdebe86d3b979ddf4 (diff) | |
| parent | cb0d89c56e5a6515a2f79e041a0f7e3937ab087d (diff) | |
| download | podman-00ecbfc1315a62940202574fb45f2ae2f4c48b63.tar.gz podman-00ecbfc1315a62940202574fb45f2ae2f4c48b63.tar.bz2 podman-00ecbfc1315a62940202574fb45f2ae2f4c48b63.zip | |
Merge pull request #2844 from haircommander/cri-o-update
move to cri-o/cri-o and build with containers/conmon
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -44,7 +44,7 @@ Any recent Podman release should be able to run rootless without any additional * Specializing in signing and pushing images to various storage backends. See [Skopeo](https://github.com/containers/skopeo/) for those tasks. * Container runtimes daemons for working with the Kubernetes CRI interface. - [CRI-O](https://github.com/kubernetes-sigs/cri-o) specializes in that. + [CRI-O](https://github.com/cri-o/cri-o) specializes in that. * Supporting `docker-compose`. We believe that Kubernetes is the defacto standard for composing Pods and for orchestrating containers, making Kubernetes YAML a defacto standard file format. Hence, Podman allows the @@ -67,7 +67,7 @@ The plan is to use OCI projects and best of breed libraries for different aspect - Storage: Container and image storage is managed by [containers/storage](https://github.com/containers/storage) - Networking: Networking support through use of [CNI](https://github.com/containernetworking/cni) - Builds: Builds are supported via [Buildah](https://github.com/containers/buildah). -- Conmon: [Conmon](https://github.com/kubernetes-sigs/cri-o) is a tool for monitoring OCI runtimes. It is part of the CRI-O package +- Conmon: [Conmon](https://github.com/cri-o/cri-o) is a tool for monitoring OCI runtimes. It is part of the CRI-O package ## Podman Information for Developers |