From d32794af15908f92a57030647a2e29ea3994126d Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sep 22 2017 19:41:52 +0000
Subject: Merge #7019 `Use container instead of docker for tag names at next branching.`


---

diff --git a/scripts/branching/make-koji-release-tags b/scripts/branching/make-koji-release-tags
index c29f88a..4472650 100755
--- a/scripts/branching/make-koji-release-tags
+++ b/scripts/branching/make-koji-release-tags
@@ -10,8 +10,8 @@ kojicli=koji
 
 $kojicli clone-tag --all --latest-only f$OLDRELEASE f$RELEASE
 $kojicli edit-tag -x mock.package_manager=dnf f$RELEASE
-$kojicli add-tag f$RELEASE-docker
-$kojicli add-tag --parent f$RELEASE-docker --arches=x86_64 f$RELEASE-docker-build
+$kojicli add-tag f$RELEASE-container
+$kojicli add-tag --parent f$RELEASE-container --arches=x86_64 f$RELEASE-container-build
 $kojicli add-tag --parent f$RELEASE f$RELEASE-updates
 $kojicli add-tag --parent f$RELEASE f$RELEASE-compose
 $kojicli add-tag --parent f$RELEASE-updates f$RELEASE-updates-candidate
@@ -44,9 +44,9 @@ $kojicli tag-pkg f$RELEASE-build $($kojicli latest-build f$OLDRELEASE-build glib
 $kojicli add-target f$RELEASE f$RELEASE-build
 $kojicli add-target f$RELEASE-candidate f$RELEASE-build f$RELEASE
 $kojicli add-target f$RELEASE-infra f$RELEASE-infra f$RELEASE-infra-candidate
-$kojicli add-target f$RELEASE-docker-candidate f$RELEASE-docker-build f$RELEASE-docker
+$kojicli add-target f$RELEASE-container-candidate f$RELEASE-container-build f$RELEASE-container
 $kojicli edit-target rawhide --dest-tag=f$RELEASE --build-tag=f$RELEASE-build
-$kojicli edit-target rawhide-docker-candidate --dest-tag=f$RELEASE-docker --build-tag=f$RELEASE-docker-build
+$kojicli edit-target rawhide-container-candidate --dest-tag=f$RELEASE-container --build-tag=f$RELEASE-container-build
 
 $kojicli remove-tag-inheritance rawhide f$OLDRELEASE
 $kojicli add-tag-inheritance rawhide f$RELEASE