diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-31 16:02:02 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-01 17:33:16 +0200 |
| commit | b039d8d4219bca73a5b86e03f34f27fbe655ec81 (patch) | |
| tree | af3b5402657a5b50c117337f5d1052919d71771c | |
| parent | 2db0f4c16b2264931b0f61678b04e4d637ed1e58 (diff) | |
Allow refs as vnf requirement versions
Change-Id: I4079fa3641373eee40f8a876a2a525635f2752eb
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/vnf/Dockerfile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 310ec0c57..2e2ffefb7 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -9,6 +9,7 @@ ARG HEAT_VIMS_TAG=release-129 ARG VROUTER_TAG=fraser ARG JUJU_TAG=tags/juju-2.2.5 ARG JUJU_WAIT_TAG=2.6.4 +ARG ABOT_CHARM=opnfv-fraser ENV GOPATH /src/epc-requirements/go ENV GOBIN /src/epc-requirements/go/bin @@ -28,11 +29,16 @@ RUN apk --no-cache add --update \ sed -i s/unf_ext\ \(.*\)/unf_ext\ \(0.0.7.4\)/g /src/vims-test/Gemfile.lock && \ git clone https://github.com/Metaswitch/quaff /src/vims-test/quaff && \ (cd /src/vims-test/quaff && git checkout $QUAFF_TAG) && \ - git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-build-infra /src/vims-test/build-infra && \ - git clone --depth 1 -b $CLOUDIFY_VIMS_TAG https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git /src/cloudify_vims && \ - git clone --depth 1 -b $HEAT_VIMS_TAG https://github.com/Metaswitch/clearwater-heat.git /src/heat_vims && \ + git clone --depth 1 https://github.com/Metaswitch/clearwater-build-infra /src/vims-test/build-infra && \ + (cd /src/vims-test/build-infra && git fetch --tags origin $VIMS_TEST_TAG && git checkout FETCH_HEAD) && \ + git clone --depth 1 https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git /src/cloudify_vims && \ + (cd /src/cloudify_vims && git fetch --tags origin $CLOUDIFY_VIMS_TAG && git checkout FETCH_HEAD) && \ + git clone --depth 1 https://github.com/Metaswitch/clearwater-heat.git /src/heat_vims && \ + (cd /src/heat_vims && git fetch --tags origin $HEAT_VIMS_TAG && git checkout FETCH_HEAD) && \ git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git /src/opnfv-vnf-vyos-blueprint && \ + (cd /src/opnfv-vnf-vyos-blueprint && git fetch --tags origin $VROUTER_TAG && git checkout FETCH_HEAD) && \ git clone --depth 1 https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \ + (cd /src/epc-requirements/abot_charm && git fetch --tags origin $ABOT_CHARM && 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 && \ |