diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-09-01 17:56:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-01 17:56:50 +0000 |
| commit | 1b299d38acb223caa21d0c3eeb32c9d2ae348a1c (patch) | |
| tree | 472a75baa9d25d3022db2edb45300befe0beed54 /docker/vnf | |
| parent | 7d846e202c8f3d596a419dc0367c144e864a1a86 (diff) | |
| parent | b039d8d4219bca73a5b86e03f34f27fbe655ec81 (diff) | |
Merge changes I4079fa36,I3ad7a38e
* changes:
Allow refs as vnf requirement versions
Avoid downloading git history
Diffstat (limited to 'docker/vnf')
| -rw-r--r-- | docker/vnf/Dockerfile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index b7e562138..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 @@ -20,7 +21,7 @@ RUN apk --no-cache add --update \ apk --no-cache add --virtual .build-deps --update \ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev g++ make && \ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ - sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \ + sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \ > upper-constraints.txt && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \ sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \ @@ -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 && \ - git clone https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \ + (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 && \ |