kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow manifest vars in docker image name

Browse source
This commit is contained in:
Anders Ingemann 2015-12-13 16:14:52 +01:00
parent d0bb9f75d3
commit 6cca4ae2e1
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootstrapvz/providers/docker/README.rst
View file

@ -20,6 +20,7 @@ Name
- ``name``: The image name is the repository and tag to where an - ``name``: The image name is the repository and tag to where an
image should be imported. image should be imported.
``required`` ``required``
``manifest vars``
Provider Provider

2
bootstrapvz/providers/docker/tasks/image.py
View file

@ -22,7 +22,7 @@ class CreateImage(Task):
tar_cmd = ['tar', '--create', '--numeric-owner', tar_cmd = ['tar', '--create', '--numeric-owner',
'--directory', info.volume.path, '.'] '--directory', info.volume.path, '.']
docker_cmd = ['docker', 'import', '--change', info._docker['dockerfile'], '-', docker_cmd = ['docker', 'import', '--change', info._docker['dockerfile'], '-',
info.manifest.name] info.manifest.name.format(**info.manifest_vars)]
cmd = ' '.join(map(quote, tar_cmd)) + ' | ' + ' '.join(map(quote, docker_cmd)) cmd = ' '.join(map(quote, tar_cmd)) + ' | ' + ' '.join(map(quote, docker_cmd))
[info._docker['container_id']] = log_check_call([cmd], shell=True) [info._docker['container_id']] = log_check_call([cmd], shell=True)

2
manifests/examples/docker/minimized-jessie.yml
View file

@ -1,5 +1,5 @@
--- ---
name: debian-{system.release}-{system.architecture}-{%y}{%m}{%d} name: debian-{system.release}-{system.architecture}-{%y}{%m}{%d}:latest
provider: provider:
name: docker name: docker
labels: labels: