Add BRANCH Argument to Dockerfiles

This is a requirement for OPNFV CI to build Dockerfiles and allows
builds to perform branch specific actions.

Change-Id: I46c5c99a74e0c9a235a483a4be32f3bd283e0ccd
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

diff --git a/docker/storperf-httpfrontend/Dockerfile b/docker/storperf-httpfrontend/Dockerfile
index 4069d24..19d620e 100644 (file)
--- a/docker/storperf-httpfrontend/Dockerfile
+++ b/docker/storperf-httpfrontend/Dockerfile
@@ -17,6 +17,8 @@ FROM nginx:stable-alpine
 MAINTAINER Mark Beierl <mark.beierl@dell.com>
 LABEL version="3.1" description="OPNFV Storperf HTTP Front End Container"
 
+ARG BRANCH=master
+
 COPY ./nginx.conf /etc/nginx/nginx.conf
 COPY ./html /etc/nginx/html
 

diff --git a/docker/storperf-master/Dockerfile b/docker/storperf-master/Dockerfile
index 69f488a..8d3ee25 100644 (file)
--- a/docker/storperf-master/Dockerfile
+++ b/docker/storperf-master/Dockerfile
@@ -19,6 +19,8 @@ FROM ubuntu:14.04
 MAINTAINER Jose Lausuch <jose.lausuch@ericsson.com>
 LABEL version="5.0" description="OPNFV Storperf Docker container"
 
+ARG BRANCH=master
+
 ENV repos_dir /home/opnfv/repos
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/docker/storperf-reporting/Dockerfile b/docker/storperf-reporting/Dockerfile
index 3e8a95a..bbcbdb3 100644 (file)
--- a/docker/storperf-reporting/Dockerfile
+++ b/docker/storperf-reporting/Dockerfile
@@ -19,6 +19,8 @@ FROM alpine:3.1
 MAINTAINER Mark Beierl <mark.beierl@dell.com>
 LABEL version="0.1" description="OPNFV Storperf Reporting Container"
 
+ARG BRANCH=master
+
 RUN apk add --update python py-pip
 
 COPY . /home/opnfv/storperf-reporting
@@ -28,4 +30,4 @@ RUN pip install -r /home/opnfv/storperf-reporting/requirements.txt
 
 CMD ["python", "app.py"]
 
-EXPOSE 5000
\ No newline at end of file
+EXPOSE 5000