aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-10 23:39:11 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-10 23:45:48 +0100
commit9e72ad1edd88aada55a0328cd72d4941c4e6fc60 (patch)
treea80632cf12dfc1e714b7ffa59e5888ed37d8378f
parent67557f7cbd0e96b1654d9925bc163cb46c25d0c9 (diff)
Add BRANCH as Docker build arg
It conforms with the prerequisite of the current releng Docker script. BRANCH can be considered as useless because releng already clones the right git branch. It's a temporarily solution before modifying a script used by lots of OPNFV projects. Change-Id: I585d7a79a9ebaeaffd69af1da1731c44e131f6b5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/components/Dockerfile3
-rw-r--r--docker/healthcheck/Dockerfile3
2 files changed, 6 insertions, 0 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index 8923e4cd..33e20eef 100644
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -1,4 +1,7 @@
FROM opnfv/functest-core
+# useless build arg forced by releng/jjb/releng/opnfv-docker.sh
+ARG BRANCH=master
+
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 8923e4cd..33e20eef 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,7 @@
FROM opnfv/functest-core
+# useless build arg forced by releng/jjb/releng/opnfv-docker.sh
+ARG BRANCH=master
+
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]