summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-10 15:10:33 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-11 17:29:18 +0200
commit5988d84f62cb19abfdddf1475177f174d6c2597d (patch)
tree65db3de1dd2cb093027b5c47801e01577723f11d
parentde4d09cf210179f3944b854f4a16c103244032d9 (diff)
Fix godeps commit id
Change-Id: I7af07849fb70ef53f293002f313035b46731b705 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/vnf/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 9df7753d0..7f7275894 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -10,6 +10,7 @@ ARG VROUTER_TAG=fraser
ARG JUJU_TAG=tags/juju-2.2.5
ARG JUJU_WAIT_TAG=2.6.4
ARG ABOT_CHARM=opnfv-fraser
+ARG GODEPS_TAG=404a7e748cd352bb0d7449dedc645546eebbfc6e
ENV GOPATH /src/epc-requirements/go
ENV GOBIN /src/epc-requirements/go/bin
@@ -58,7 +59,8 @@ RUN apk --no-cache add --update \
git checkout FETCH_HEAD) && \
python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
juju-wait==$JUJU_WAIT_TAG && \
- go get github.com/rogpeppe/godeps && \
+ go get -d github.com/rogpeppe/godeps && \
+ (cd $GOPATH/src/github.com/rogpeppe/godeps && git checkout $GODEPS_TAG && go install -v github.com/rogpeppe/godeps) && \
go get -d -v github.com/juju/juju/... || true && \
(cd $GOPATH/src/github.com/juju/juju && git checkout $JUJU_TAG && godeps -u dependencies.tsv) && \
go install -v github.com/juju/juju/... && \