From 1bcbe0bac328e26341ba68341d4b809c32b8242f Mon Sep 17 00:00:00 2001 From: mbeierl Date: Wed, 29 Mar 2017 21:00:50 -0400 Subject: Use tagged version of graphite Changes the docker build procedure to use a pip install of a specific version of graphite so that it doesn't break when upstream changes occur. Change-Id: I2316912fc04568c441212087665e384075e409a6 JIRA: STORPERF-110 Signed-off-by: mbeierl --- build-dev-docker.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'build-dev-docker.sh') diff --git a/build-dev-docker.sh b/build-dev-docker.sh index 131d8ef..3a565f3 100755 --- a/build-dev-docker.sh +++ b/build-dev-docker.sh @@ -8,12 +8,17 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +cd `dirname $0` + echo "Creating a docker image from the current working directory..." -sed "s|RUN git clone https://gerrit.opnfv.org/gerrit/storperf.*$|COPY . \${repos_dir}/storperf|" docker/Dockerfile > Dockerfile -sed -i "s|COPY storperf.pp|COPY docker/storperf.pp|" Dockerfile -sed -i "s|COPY supervisord.conf|COPY docker/supervisord.conf|" Dockerfile +cp docker/Dockerfile Dockerfile.dev +sed -i "s|COPY |COPY docker\/|" Dockerfile.dev +sed -i "s|ADD |ADD docker\/|" Dockerfile.dev +sed -i "s|RUN git clone.*https://gerrit.opnfv.org/gerrit/storperf.*$|COPY . \${repos_dir}/storperf|" Dockerfile.dev + +diff docker/Dockerfile Dockerfile.dev -docker build -t opnfv/storperf:dev . +docker build -t opnfv/storperf:dev -f Dockerfile.dev . -rm -f Dockerfile +rm -f Dockerfile.dev -- cgit 1.2.3-korg