Update container image docs + fix unstable execution

Update the order of image documentation to be from most to least stable.
Similarly, avoid depending on execution of upstream podman, when
building/pushing.  It's easily possible for this build to function but
execution to fail due to some partially implemented feature.

Also, ensure images tagged `latest` are pushed for every matrix
item.  For 'upstream' and 'testing', this replaces use of the
'master' tag.

Lastly, update workflow comments and split the 'podman' and 'containers'
FQIN steps and outputs to improve readability.

Signed-off-by: Chris Evich <cevich@redhat.com>

2 files changed, 18 insertions, 41 deletions

diff --git a/contrib/podmanimage/README.md b/contrib/podmanimage/README.md
index 7641f6c7e..32590d185 100644
--- a/contrib/podmanimage/README.md
+++ b/contrib/podmanimage/README.md
@@ -16,11 +16,24 @@ default to `/`.
 
 The container images are:
 
-  * quay.io/containers/podman - 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/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).
+  * `quay.io/containers/podman:<version>` and `quay.io/podman/stable:<version>` -
+    These images are built when a new podman version becomes available in
+    Fedora.  These images are intended to be unchanging and stable, they will
+    never be updated by automation once they've been pushed.  For build
+    details, see the configuration used to build it,
+    [podmanimage/stable/Dockerfile](stable/Dockerfile).
+  * `quay.io/containers/podman:latest` and `quay.io/podman/stable:latest` -
+    Built daily using the same Containerfile as above.  The podman version
+    will remain the "latest" available in Fedora, however the other image
+    contents may vary compared to the version-tagged images.
+  * `quay.io/podman/testing:latest` - This image is built daily, using the
+    latest version of Podman that was in the Fedora `updates-testing` repository.
+    The image is Built with [podmanimage/testing/Dockerfile](testing/Dockerfile).
+  * `quay.io/podman/upstream:latest` - This image is built daily using the latest
+    code found in this GitHub repository.  Due to the image changing frequently,
+    it's not guaranteed to be stable or even executable.  The image is built with
+    [podmanimage/upstream/Dockerfile](upstream/Dockerfile).
+
 ## Sample Usage
 
 
diff --git a/contrib/podmanimage/stable/manual/Containerfile b/contrib/podmanimage/stable/manual/Containerfile
deleted file mode 100644
index fb4d1adc0..000000000
--- a/contrib/podmanimage/stable/manual/Containerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-# stable/manual/Containerfile
-#
-# Build a Podman container image from the latest
-# stable version of Podman on the Fedora Updates System.
-# https://bodhi.fedoraproject.org/updates/?search=podman
-# This image can be used to create a secured container
-# that runs safely with privileges within the container.
-# This Containerfile builds version 1.7.0, the version and
-# the RPM name would need to be adjusted before a run as
-# appropriate.
-#
-# To use, first copy an rpm file from bodhi to `/root/tmp`
-# and then run:
-#   'podman build -f ./Containerfile -t quay.io/podman/stable:v1.7.0 .'
-#
-# Once complete run:
-#   `podman push quay.io/stable:v1.7.0 docker://quay.io/podman/stable:v1.7.0`
-#
-# Start Build Process using the latest Fedora
-FROM registry.fedoraproject.org/fedora:latest
-
-# Don't include container-selinux and remove
-# directories used by dnf that are just taking
-# up space.
-#
-COPY /tmp/podman-1.7.0-3.fc30.x86_64.rpm /tmp
-RUN yum -y install /tmp/podman-1.7.0-3.fc30.x86_64.rpm fuse-overlayfs --exclude container-selinux; rm -rf /var/cache /var/log/dnf* /var/log/yum.* /tmp/podman*.rpm
-
-ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/
-
-# chmod containers.conf and adjust storage.conf to enable Fuse storage.
-RUN chmod 644 /etc/containers/containers.conf; sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' -e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' /etc/containers/storage.conf
-RUN mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers /var/lib/shared/vfs-images /var/lib/shared/vfs-layers; touch /var/lib/shared/overlay-images/images.lock; touch /var/lib/shared/overlay-layers/layers.lock; touch /var/lib/shared/vfs-images/images.lock; touch /var/lib/shared/vfs-layers/layers.lock
-
-
-ENV _CONTAINERS_USERNS_CONFIGURED=""