#262 Fix docker_label keyword and fix label caps
Merged 3 years ago by maxamillion. Opened 4 years ago by maxamillion.
maxamillion/pungi-fedora master-fix-docker-labels  into  master

file modified
+3 -12
@@ -229,12 +229,8 @@ 

                  'dockerversion': "1.10.1",

                  'docker_cmd':  '[ "/bin/bash" ]',

                  'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',

-                 'docker_labels': {

-                     'Name': 'fedora',

-                     'License': u'MIT',

-                     'Vendor': 'Fedora Project',

-                     'Version': '26',

-                 },

+                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',

+ 

              },

          },

          {
@@ -256,12 +252,7 @@ 

                  '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',

-                 },

+                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',

              },

          }

          ],

file modified
+2 -12
@@ -293,12 +293,7 @@ 

                  'dockerversion': "1.10.1",

                  'docker_cmd':  '[ "/bin/bash" ]',

                  'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',

-                 'docker_labels': {

-                     'Name': 'fedora',

-                     'License': u'MIT',

-                     'Vendor': 'Fedora Project',

-                     'Version': '27',

-                 },

+                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',

              },

          },

          {
@@ -318,12 +313,7 @@ 

                  'dockerversion': "1.10.1",

                  'docker_cmd':  '[ "/bin/bash" ]',

                  'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',

-                 'docker_labels': {

-                     'Name': 'fedora-minimal',

-                     'License': u'MIT',

-                     'Vendor': 'Fedora Project',

-                     'Version': '27',

-                 },

+                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',

              },

          }

          ],

Previously the key 'docker_labels' was used but this isn't actually
picked up by imagefactory because the parameter key it's looking for
is 'docker_label'. This patch resolves that.

Also included in this patch is a change to set the labels to be
lowercase as defined in the Fedora Container Guidelines.

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

rebased

4 years ago

is this still needed? it has conflicts

rebased

3 years ago

Pull-Request has been merged by maxamillion

3 years ago

the version is all wrong, given master is now set for rawhide based on f28

the version is all wrong, given master is now set for rawhide based on f28

yeah @maxamillion can you update fedora.conf to have 28 in it?

Metadata