PR#188: Add dockerversion to factory-parameters - pungi-fedora

pungi-fedora

#188 Add dockerversion to factory-parameters

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

maxamillion/pungi-fedora f26 into f26

Add dockerversion to factory-parameters

Adam Miller • 7 years ago

0da396b

fedora-docker.conf

file modified

		`@@ -223,6 +223,7 @@`
		`'subvariant': 'Docker_Base'`
		`},`
		`'factory-parameters': {`
		`+ 'dockerversion': "1.10.1",`
		`'docker_cmd': "[ '/bin/bash' ]",`
		`'docker_env': "[ 'DISTTAG=f26docker', 'FGC=f26' ]",`
		`'docker_labels': {`

fedora.conf

file modified

		`@@ -286,6 +286,7 @@`
		`'failable': ['*'],`
		`},`
		`'factory-parameters': {`
		`+ 'dockerversion': "1.10.1",`
		`'docker_cmd': "[ '/bin/bash' ]",`
		`'docker_env': "[ 'DISTTAG=f26docker', 'FGC=f26' ]",`
		`'docker_labels': {`
		`@@ -311,6 +312,7 @@`
		`'failable': ['*'],`
		`},`
		`'factory-parameters': {`
		`+ 'dockerversion': "1.10.1",`
		`'docker_cmd': "[ '/bin/bash' ]",`
		`'docker_env': "[ 'DISTTAG=f26docker', 'FGC=f26' ]",`
		`'docker_labels': {`

maxamillion commented 7 years ago

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.

Also, add the docker metadata to the alpha config.

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