diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-07 14:14:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-07 14:14:13 +0100 |
commit | 43bf4f6626cc25ab839d989c025771de4669f86b (patch) | |
tree | ac0b90dd86a59db751e71743fb5683cc9b8fef9f /contrib/podmanimage/README.md | |
parent | b92a9090ed42cfad02a3d75b0b81e3aa87233fc8 (diff) | |
parent | 6ad35e848d72943f55e9aa02f168ff1ccf5edf7e (diff) | |
download | podman-43bf4f6626cc25ab839d989c025771de4669f86b.tar.gz podman-43bf4f6626cc25ab839d989c025771de4669f86b.tar.bz2 podman-43bf4f6626cc25ab839d989c025771de4669f86b.zip |
Merge pull request #5359 from TomSweeneyRedHat/dev/tsweeney/fixquay
Fix upstream dockerfile and add 'by hand' ctrfile
Diffstat (limited to 'contrib/podmanimage/README.md')
-rw-r--r-- | contrib/podmanimage/README.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/podmanimage/README.md b/contrib/podmanimage/README.md index ab55f3189..9d841cdba 100644 --- a/contrib/podmanimage/README.md +++ b/contrib/podmanimage/README.md @@ -10,10 +10,10 @@ the images live are public and can be pulled without credentials. These contain resulting containers can run safely with privileges within the container. The container images are built using the latest Fedora and then Podman is installed into them: - * quay.io/podman/stable - This image is built using the latest stable version of Podman in a Fedora based container. Built with podman/stable/Dockerfile. - * quay.io/podman/upstream - This image is built using the latest code found in this GitHub repository. When someone creates a commit and pushes it, the image is created. Due to that the image changes frequently and is not guaranteed to be stable. Built with podmanimage/upstream/Dockerfile. - * quay.io/podman/testing - This image is built using the latest version of Podman that is or was in updates testing for Fedora. At times this may be the same as the stable image. This container image will primarily be used by the development teams for verification testing when a new package is created. Built with podmanimage/testing/Dockerfile. - + * quay.io/podman/stable - This image is built using the latest stable version of Podman in a Fedora based container. Built with [podmanimage/stable/Dockerfile](stable/Dockerfile). + * quay.io/podman/upstream - This image is built using the latest code found in this GitHub repository. When someone creates a commit and pushes it, the image is created. Due to that the image changes frequently and is not guaranteed to be stable. Built with [podmanimage/upstream/Dockerfile](upstream/Dockerfile). + * quay.io/podman/testing - This image is built using the latest version of Podman that is or was in updates testing for Fedora. At times this may be the same as the stable image. This container image will primarily be used by the development teams for verification testing when a new package is created. Built with [podmanimage/testing/Dockerfile](testing/Dockerfile). + * quay.io/podman/stable:version - This image is built manually using a Fedora based container. An RPM is first pulled from the [Fedora Updates System](https://bodhi.fedoraproject.org/) and the image is built from there. For more details, see the Containerfile used to build it, [podmanimage/stable/manual/Containerfile](stable/manual/Containerfile). ## Sample Usage |