diff --git a/doc/configuration.rst b/doc/configuration.rst index da5c4e81..e2e722ad 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -971,7 +971,7 @@ Example # correct SHA1 hash will be put into the URL below automatically 'ksurl': 'https://git.fedorahosted.org/git/spin-kickstarts.git?somedirectoryifany#HEAD', 'kickstart': "fedora-docker-base.ks", - 'repo': ["http://someextrarepos.org/repo", "ftp://rekcod.oi/repo]. + 'repo': ["http://someextrarepos.org/repo", "ftp://rekcod.oi/repo"], 'distro': 'Fedora-20', 'disk_size': 3, @@ -981,14 +981,7 @@ Example 'factory-parameters': { 'docker_cmd': "[ '/bin/bash' ]", 'docker_env': "[ 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' ]", - 'docker_labels': "{ - 'Name': 'fedora-docker-base', - 'License': u'GPLv2', - 'RUN': 'docker run -it --rm ${OPT1} --privileged -v \`pwd\`:/atomicapp -v /run:/run -v /:/host --net=host --name ${NAME} -e NAME=${NAME} -e IMAGE=${IMAGE} ${IMAGE} -v ${OPT2} run ${OPT3} /atomicapp', - 'Vendor': 'Fedora Project', - 'Version': '23', - 'Architecture': 'x86_64' - }", + 'docker_labels': "{'Name': 'fedora-docker-base', 'License': u'GPLv2', 'RUN': 'docker run -it --rm ${OPT1} --privileged -v \`pwd\`:/atomicapp -v /run:/run -v /:/host --net=host --name ${NAME} -e NAME=${NAME} -e IMAGE=${IMAGE} ${IMAGE} -v ${OPT2} run ${OPT3} /atomicapp', 'Vendor': 'Fedora Project', 'Version': '23', 'Architecture': 'x86_64' }", } }, { @@ -1001,7 +994,7 @@ Example # correct SHA1 hash will be put into the URL below automatically 'ksurl': 'https://git.fedorahosted.org/git/spin-kickstarts.git?somedirectoryifany#HEAD', 'kickstart': "fedora-docker-base.ks", - 'repo': ["http://someextrarepos.org/repo", "ftp://rekcod.oi/repo]. + 'repo': ["http://someextrarepos.org/repo", "ftp://rekcod.oi/repo"], 'distro': 'Fedora-20', 'disk_size': 3,