From 6cca4ae2e143104e3450ced4f276a4c8a3100234 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 13 Dec 2015 16:14:52 +0100 Subject: [PATCH] Allow manifest vars in docker image name --- bootstrapvz/providers/docker/README.rst | 1 + bootstrapvz/providers/docker/tasks/image.py | 2 +- manifests/examples/docker/minimized-jessie.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrapvz/providers/docker/README.rst b/bootstrapvz/providers/docker/README.rst index 3b0ba4c..5a8cc57 100644 --- a/bootstrapvz/providers/docker/README.rst +++ b/bootstrapvz/providers/docker/README.rst @@ -20,6 +20,7 @@ Name - ``name``: The image name is the repository and tag to where an image should be imported. ``required`` + ``manifest vars`` Provider diff --git a/bootstrapvz/providers/docker/tasks/image.py b/bootstrapvz/providers/docker/tasks/image.py index d4fc067..0faba28 100644 --- a/bootstrapvz/providers/docker/tasks/image.py +++ b/bootstrapvz/providers/docker/tasks/image.py @@ -22,7 +22,7 @@ class CreateImage(Task): tar_cmd = ['tar', '--create', '--numeric-owner', '--directory', info.volume.path, '.'] 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)) [info._docker['container_id']] = log_check_call([cmd], shell=True) diff --git a/manifests/examples/docker/minimized-jessie.yml b/manifests/examples/docker/minimized-jessie.yml index e46e71c..6405956 100644 --- a/manifests/examples/docker/minimized-jessie.yml +++ b/manifests/examples/docker/minimized-jessie.yml @@ -1,5 +1,5 @@ --- -name: debian-{system.release}-{system.architecture}-{%y}{%m}{%d} +name: debian-{system.release}-{system.architecture}-{%y}{%m}{%d}:latest provider: name: docker labels: