From 0da396ba64e70d9ef400291fb49bfbce3581dfe7 Mon Sep 17 00:00:00 2001
From: Adam Miller <maxamillion@fedoraproject.org>
Date: Mar 30 2017 17:23:24 +0000
Subject: Add dockerversion to factory-parameters


Currently, imagefactory's docker plugin will default an older
version of the metadata imager format that is not compatible with
the latest versions of docker. This change tells the plugin to use
the docker version "1.10.1" metadata format which is compatible with
all currently available docker releases.

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

---

diff --git a/fedora-docker.conf b/fedora-docker.conf
index f301537..2a324c3 100644
--- a/fedora-docker.conf
+++ b/fedora-docker.conf
@@ -223,6 +223,7 @@ image_build = {
                     'subvariant': 'Docker_Base'
                     },
             'factory-parameters': {
+                'dockerversion': "1.10.1",
                 'docker_cmd':  "[ '/bin/bash' ]",
                 'docker_env': "[ 'DISTTAG=f26docker', 'FGC=f26' ]",
                 'docker_labels': {
diff --git a/fedora.conf b/fedora.conf
index b374778..55a5e71 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -286,6 +286,7 @@ image_build = {
                     'failable': ['*'],
                     },
             'factory-parameters': {
+                'dockerversion': "1.10.1",
                 'docker_cmd':  "[ '/bin/bash' ]",
                 'docker_env': "[ 'DISTTAG=f26docker', 'FGC=f26' ]",
                 'docker_labels': {
@@ -311,6 +312,7 @@ image_build = {
                     'failable': ['*'],
                     },
             'factory-parameters': {
+                'dockerversion': "1.10.1",
                 'docker_cmd':  "[ '/bin/bash' ]",
                 'docker_env': "[ 'DISTTAG=f26docker', 'FGC=f26' ]",
                 'docker_labels': {