From e3b77bdae089e978c224de7c07b14ea16ed24fe1 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Aug 14 2017 21:43:22 +0000
Subject: container: pull changes back from master


Mostly comes from f6e7f69.

- Add minimal image building.
- bump disk size to 5

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>

---

diff --git a/fedora-docker.conf b/fedora-docker.conf
index 6315a6c..a33d1af 100644
--- a/fedora-docker.conf
+++ b/fedora-docker.conf
@@ -174,6 +174,7 @@ image_volid_formats = [
 image_volid_layered_product_formats = []
 # Replace 'Cloud' with 'C' in volume id etc.
 volume_id_substitutions = {
+         'Atomic': 'AH',
         'Rawhide': 'rawh',
          'Images': 'img',
     'MATE_Compiz': 'MATE',
@@ -204,7 +205,7 @@ image_build = {
     '^Docker$': [
         {
             'image-build': {
-                    'format': [('docker', 'tar.xz')]
+                    'format': [('docker', 'tar.xz')],
                     'name': 'Fedora-Docker-Base',
                     'target': 'f26',
                     'version': '26',
@@ -212,19 +213,19 @@ image_build = {
                     # correct SHA1 hash will be put into the URL below automatically
                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
                     'kickstart': 'fedora-docker-base.ks',
-                    'distro': 'Fedora-20',
-                    'disk_size': 3,
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
                     'arches': ['x86_64', 'armhfp'],
+                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
                     'repo': [
                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
                     ],
-                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
                     'subvariant': 'Docker_Base'
                     },
             'factory-parameters': {
                 'dockerversion': "1.10.1",
-                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_cmd':  '[ "/bin/bash" ]',
                 'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
                 'docker_labels': {
                     'Name': 'fedora',
@@ -233,6 +234,33 @@ image_build = {
                     'Version': '26',
                 },
             },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Minimal-Base',
+                    'kickstart': 'fedora-docker-base-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['x86_64', 'armhfp'],
+                    'install_tree_from': 'Everything',
+                    'repo': [
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
+                    ],
+                    'subvariant': 'Container_Minimal_Base',
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora-minimal',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
         }
         ],
 }