66ae6bcfbd
Update to 2016.11.2 version, bugfixes OBS-URL: https://build.opensuse.org/request/show/458508 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=85
49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
From 409e1835e0f26295212d1d148d1e7b42cf7dc6b0 Mon Sep 17 00:00:00 2001
|
|
From: Michael Calmer <mc@suse.de>
|
|
Date: Thu, 19 Jan 2017 15:39:10 +0100
|
|
Subject: [PATCH] add buildargs option to dockerng.build
|
|
|
|
---
|
|
salt/modules/dockerng.py | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/salt/modules/dockerng.py b/salt/modules/dockerng.py
|
|
index 6c31c18289..87000e3846 100644
|
|
--- a/salt/modules/dockerng.py
|
|
+++ b/salt/modules/dockerng.py
|
|
@@ -3553,7 +3553,8 @@ def build(path=None,
|
|
rm=True,
|
|
api_response=False,
|
|
fileobj=None,
|
|
- dockerfile=None):
|
|
+ dockerfile=None,
|
|
+ buildargs=None):
|
|
'''
|
|
Builds a docker image from a Dockerfile or a URL
|
|
|
|
@@ -3587,6 +3588,10 @@ def build(path=None,
|
|
|
|
.. versionadded:: develop
|
|
|
|
+ buildargs
|
|
+ A dictionary of build arguments provided to the docker build process.
|
|
+
|
|
+
|
|
**RETURN DATA**
|
|
|
|
A dictionary containing one or more of the following keys:
|
|
@@ -3633,7 +3638,8 @@ def build(path=None,
|
|
fileobj=fileobj,
|
|
rm=rm,
|
|
nocache=not cache,
|
|
- dockerfile=dockerfile)
|
|
+ dockerfile=dockerfile,
|
|
+ buildargs=buildargs)
|
|
ret = {'Time_Elapsed': time.time() - time_started}
|
|
_clear_context()
|
|
|
|
--
|
|
2.11.0
|
|
|
|
|