From 6ad35e848d72943f55e9aa02f168ff1ccf5edf7e Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Sat, 29 Feb 2020 18:20:49 -0500 Subject: Fix upstream dockerfile and add 'by hand' ctrfile The podmanimage/upstream/Dockerfile had two rpms in its build procedure that are no longer available. The atomic-registries has been removed and the md2man has been renamed. In addtion conmon was not being installed and I've added that. I've been using a Containerfile to build or rebuild a specific version of the podmanimage stored in the stable repository with a version tag. As the other Containerfiles have been updated by others, and in case anyone else needs to build it, I've added it to the repo and have also updated the readme.md. FWIW, the builds in the quay.io/podman/upstream have been failing for a while due to missing rpms. Signed-off-by: TomSweeneyRedHat --- contrib/podmanimage/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'contrib/podmanimage/README.md') 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 -- cgit v1.2.3-54-g00ecf