diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-03 20:54:58 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-03 21:07:32 +0200 |
| commit | 951fc46b7499d9f230c6e8f0e1629ac2325c5ad7 (patch) | |
| tree | d3e92278aea5df2a8f42184245fcfde27170c817 | |
| parent | 0afa73e878f1d2c3f5d493b23ebc68f14f302166 (diff) | |
Rewrite git clones
Change-Id: I04c60b6c10ccd7b7e939002505e6e43e9c98eae7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit ca3c9cf6f57c87aee8c6f0b93f70d84e3df736de)
| -rw-r--r-- | docker/core/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 80cdeea5..3c4963d5 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -5,8 +5,10 @@ ARG OPENSTACK_TAG=stable/pike ARG OPNFV_TAG=stable/fraser RUN apk --no-cache add --update python py-pip bash git grep && \ - git clone --depth 1 https://gerrit.opnfv.org/gerrit/functest-kubernetes /src/functest-kubernetes && \ - (cd /src/functest-kubernetes && git fetch --depth 1 --tags origin $BRANCH && git checkout FETCH_HEAD) && \ + git init /src/functest-kubernetes && \ + (cd /src/functest-kubernetes && \ + git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \ + git checkout FETCH_HEAD) && \ pip install \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 2ea1e762..2007b726 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -7,8 +7,10 @@ RUN apk --no-cache add --update make py-pip bash git go \ libffi libssl1.0 libjpeg-turbo && \ apk --no-cache add --virtual .build-deps --update \ python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ - git clone --depth 1 https://github.com/kubernetes/kubernetes /src/k8s.io/kubernetes && \ - (cd /src/k8s.io/kubernetes && git fetch --depth 1 --tags origin $K8S_TAG && git checkout FETCH_HEAD && \ + git init /src/k8s.io/kubernetes && \ + (cd /src/k8s.io/kubernetes && \ + git fetch --tags https://github.com/kubernetes/kubernetes $K8S_TAG && \ + git checkout FETCH_HEAD && \ # Replace the amd64 with arm64 when building e2e.test on arm platform. if [ "$(uname -m)" = "aarch64" ]; then sed -i "s/amd64/arm64/g" ./test/images/clusterapi-tester/pod.yaml ; fi && \ make kubectl ginkgo && \ |