davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch from docker to container namespace

Browse Source 
Fedora Atomic WG has decided to move from the "docker" namespace to
the "container" namespace for the sake of making it more generic in
order to target all OCI Compliant container runtimes instead of
a specific implementation. This update changes what is necessary for
to the base image metadata as well as add a transitional second call
to handle both the docker and container namespace for block_retired.

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
This commit is contained in:
Adam Miller 2017-04-26 17:16:16 -05:00
parent 86eae3279e
commit ae2f611637
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fedora-docker.conf
View File

@ -226,7 +226,7 @@ image_build = {
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f27docker", "FGC=f27" ]',
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
'docker_labels': {
'Name': 'fedora',
'License': u'MIT',

4
fedora.conf
View File

@ -290,7 +290,7 @@ image_build = {
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f27docker", "FGC=f27" ]',
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
'docker_labels': {
'Name': 'fedora',
'License': u'MIT',
@ -315,7 +315,7 @@ image_build = {
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f27docker", "FGC=f27" ]',
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
'docker_labels': {
'Name': 'fedora-minimal',
'License': u'MIT',

1
nightly.sh
View File

@ -55,6 +55,7 @@ popd
./releng/scripts/block_retired.py
./releng/scripts/block_retired.py --namespace=docker
./releng/scripts/block_retired.py --namespace=container
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"