PR#264: Fix docker_label keyword and fix label caps - pungi-fedora

pungi-fedora

#264 Fix docker_label keyword and fix label caps

Merged 6 years ago by ausil. Opened 6 years ago by maxamillion.

maxamillion/pungi-fedora f25-fix-docker-labels into f25

Fix docker_label keyword and fix label caps

Adam Miller • 6 years ago

a7a3eeb

fedora-docker.conf

file modified

+5 -5

		`@@ -226,11 +226,11 @@`
		`'dockerversion': "1.10.1",`
		`'docker_cmd': '[ "/usr/bin/bash" ]',`
		`'docker_env': '[ "DISTTAG=f25container", "FGC=f25" ]',`
		`- 'docker_labels': {`
		`- 'Name': 'fedora',`
		`- 'License': u'MIT',`
		`- 'Vendor': 'Fedora Project',`
		`- 'Version': '25',`
		`+ 'docker_label': {`
		`+ 'name': 'fedora',`
		`+ 'license': u'MIT',`
		`+ 'vendor': 'Fedora Project',`
		`+ 'version': '25',`
		`},`
		`},`
		`}`

fedora.conf

file modified

+5 -5

		`@@ -293,11 +293,11 @@`
		`'dockerversion': "1.10.1",`
		`'docker_cmd': '[ "/usr//bin/bash" ]',`
		`'docker_env': '[ "DISTTAG=f25container", "FGC=f25" ]',`
		`- 'docker_labels': {`
		`- 'Name': 'fedora',`
		`- 'License': u'MIT',`
		`- 'Vendor': 'Fedora Project',`
		`- 'Version': '25',`
		`+ 'docker_label': {`
		`+ 'name': 'fedora',`
		`+ 'license': u'MIT',`
		`+ 'vendor': 'Fedora Project',`
		`+ 'version': '25',`
		`},`
		`},`
		`},`

maxamillion commented 6 years ago

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