From fa954936d3877fc1e0b9338a5df13e961ef9b3ac Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Sun, 6 Feb 2022 15:49:44 +0000
Subject: [PATCH] Replace centos:8 with centos:stream8 (#3431)

---
 conftest.py                                   |  2 +-
 docs/examples.rst                             | 19 ++++++++-----------
 .../molecule.yml                              |  2 +-
 src/molecule/data/Dockerfile.j2               |  2 +-
 src/molecule/data/validate-dockerfile.yml     |  7 ++++---
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/conftest.py b/conftest.py
index 01e0408b6..22b7fbb0b 100644
--- a/conftest.py
+++ b/conftest.py
@@ -17,4 +17,4 @@ def environ():
 
     # adds extra environment variables that may be needed during testing
     if not os.environ.get("TEST_BASE_IMAGE", ""):
-        os.environ["TEST_BASE_IMAGE"] = "docker.io/pycontribs/centos:8"
+        os.environ["TEST_BASE_IMAGE"] = "quay.io/centos/centos:stream8"
diff --git a/docs/examples.rst b/docs/examples.rst
index abd717ec5..1b841caa1 100644
--- a/docs/examples.rst
+++ b/docs/examples.rst
@@ -24,8 +24,7 @@ and ``Dockerfile.j2`` as follows.
 Append the following code block to the end of ``Dockerfile.j2``. It creates an
 ``ansible`` user with passwordless sudo privileges.
 
-The variable ``SUDO_GROUP`` depends on the target distribution. ``centos:8``
-uses ``wheel``.
+The variable ``SUDO_GROUP`` depends on the target distribution.
 
 .. code-block:: docker
 
@@ -45,7 +44,7 @@ Modify ``provisioner.inventory`` in ``molecule.yml`` as follows:
 
     platforms:
       - name: instance
-        image: centos:8
+        image: quay.io/centos/centos:stream8
         # …
 
 .. code-block:: yaml
@@ -67,7 +66,7 @@ An example for a different platform instance name:
 
     platforms:
       - name: centos8
-        image: centos:8
+        image: quay.io/centos/centos:stream8
         # …
 
 .. code-block:: yaml
@@ -179,7 +178,7 @@ and command as follows.
 
     platforms:
       - name: instance
-        image: centos:8
+        image: quay.io/centos/centos:stream8
         command: /sbin/init
         tmpfs:
           - /run
@@ -187,9 +186,8 @@ and command as follows.
         volumes:
           - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
-Note that centos:8 image contains a `seccomp security profile for Docker`_
-which enables the use of systemd. When needed, such security profiles can be
-reused (for example `the one available in Fedora`_):
+When needed, such security profiles can be reused (for example
+`the one available in Fedora`_):
 
 .. code-block:: yaml
 
@@ -223,7 +221,7 @@ capabilities along with the same image, command, and volumes as shown in the
 
     platforms:
       - name: instance
-        image: centos:8
+        image: quay.io/centos/centos:stream8
         command: /sbin/init
         capabilities:
           - SYS_ADMIN
@@ -237,11 +235,10 @@ with the same image and command as shown in the ``non-privileged`` example.
 
     platforms:
       - name: instance
-        image: centos:8
+        image: quay.io/centos/centos:stream8
         command: /sbin/init
         privileged: True
 
-.. _`seccomp security profile for Docker`: https://docs.docker.com/engine/security/seccomp/
 .. _`the one available in fedora`: https://src.fedoraproject.org/rpms/docker/raw/88fa030b904d7af200b150e10ea4a700f759cca4/f/seccomp.json
 .. _`in a non-privileged container`: https://developers.redhat.com/blog/2016/09/13/running-systemd-in-a-non-privileged-container/
 .. _`start the container with extended privileges`: https://blog.docker.com/2013/09/docker-can-now-run-within-docker/
diff --git a/src/molecule/cookiecutter/molecule/{{cookiecutter.role_name}}/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/molecule.yml b/src/molecule/cookiecutter/molecule/{{cookiecutter.role_name}}/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/molecule.yml
index ffd7cc7a4..4cf31a06f 100644
--- a/src/molecule/cookiecutter/molecule/{{cookiecutter.role_name}}/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/molecule.yml
+++ b/src/molecule/cookiecutter/molecule/{{cookiecutter.role_name}}/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/molecule.yml
@@ -6,7 +6,7 @@ driver:
 platforms:
   - name: instance
 {%- if cookiecutter.driver_name in ['containers', 'docker', 'podman'] %}
-    image: docker.io/pycontribs/centos:8
+    image: quay.io/centos/centos:stream8
     pre_build_image: true
 {%- endif %}
 provisioner:
diff --git a/src/molecule/data/Dockerfile.j2 b/src/molecule/data/Dockerfile.j2
index 530847931..2225ebe2e 100644
--- a/src/molecule/data/Dockerfile.j2
+++ b/src/molecule/data/Dockerfile.j2
@@ -1,6 +1,6 @@
 # Molecule managed
 
-{% if item.registry is defined %}
+{% if item.registry is defined and '/' not in item.image %}
 FROM {{ item.registry.url }}/{{ item.image }}
 {% else %}
 FROM {{ item.image }}
diff --git a/src/molecule/data/validate-dockerfile.yml b/src/molecule/data/validate-dockerfile.yml
index 3cd556975..271fff8c5 100644
--- a/src/molecule/data/validate-dockerfile.yml
+++ b/src/molecule/data/validate-dockerfile.yml
@@ -8,15 +8,16 @@
       # platforms supported as being managed by molecule/ansible, this does
       # not mean molecule itself can run on them.
       - image: alpine:edge
-      - image: centos:7
-      - image: centos:8
+      - image: quay.io/centos/centos:7
+      - image: quay.io/centos/centos:stream8
       - image: ubuntu:latest
       - image: debian:latest
   tasks:
 
     - name: create temporary dockerfiles
       tempfile:
-        prefix: "molecule-dockerfile-{{ item.image }}"
+        # sanitize image name to be filename safe
+        prefix: "molecule-dockerfile-{{ item.image | regex_replace('\/', '-') }}"
         suffix: build
       register: temp_dockerfiles
       with_items: "{{ platforms }}"