diff options
| author |   Mark Beierl <mark.beierl@dell.com> | 2017-07-25 16:21:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-25 16:21:04 +0000 |
| commit | d1950be43cd82d1e2c12fff0303ac4d8c0f586e8 (patch) | |
| tree | f3ea4c2298735166990111d024348a271b6499d2 | |
| parent | ea4c439b56b22e48a2bf2bdfe709a79cbe4df784 (diff) | |
| parent | b0c2d5ecb29b87ca864ec4168901328fb6c6ea0e (diff) | |
Merge "Add BRANCH Argument to Dockerfiles"
| -rw-r--r-- | docker/storperf-httpfrontend/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/storperf-master/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/storperf-reporting/Dockerfile | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/docker/storperf-httpfrontend/Dockerfile b/docker/storperf-httpfrontend/Dockerfile index 4069d24..19d620e 100644 --- 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 --- 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 --- 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 |