From ae2f61163711ca4fd17a660890c9e8ecd27c4301 Mon Sep 17 00:00:00 2001
From: Adam Miller <maxamillion@fedoraproject.org>
Date: Apr 26 2017 22:16:16 +0000
Subject: Switch from docker to container namespace


Fedora Atomic WG has decided to move from the "docker" namespace to
the "container" namespace for the sake of making it more generic in
order to target all OCI Compliant container runtimes instead of
a specific implementation. This update changes what is necessary for
to the base image metadata as well as add a transitional second call
to handle both the docker and container namespace for block_retired.

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>

---

diff --git a/fedora-docker.conf b/fedora-docker.conf
index e2eca2a..f772b8f 100644
--- a/fedora-docker.conf
+++ b/fedora-docker.conf
@@ -226,7 +226,7 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f27docker", "FGC=f27" ]',
+                'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
                 'docker_labels': {
                     'Name': 'fedora',
                     'License': u'MIT',
diff --git a/fedora.conf b/fedora.conf
index b96e8f8..66b3281 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -290,7 +290,7 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f27docker", "FGC=f27" ]',
+                'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
                 'docker_labels': {
                     'Name': 'fedora',
                     'License': u'MIT',
@@ -315,7 +315,7 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f27docker", "FGC=f27" ]',
+                'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
                 'docker_labels': {
                     'Name': 'fedora-minimal',
                     'License': u'MIT',
diff --git a/nightly.sh b/nightly.sh
index e168f4f..d585c24 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -55,6 +55,7 @@ popd
 
 ./releng/scripts/block_retired.py
 ./releng/scripts/block_retired.py --namespace=docker
+./releng/scripts/block_retired.py --namespace=container
 
 CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"