diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-09-14 07:52:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-14 07:52:03 +0000 |
| commit | c34e1ef3c7f5cb047fcbdb8f7f3d6ed2b832aa0c (patch) | |
| tree | d819b8b866d70111de9a102575a29412c270be67 | |
| parent | 42c99773c40f669b18c489a8f8b1c9bbb79d51d9 (diff) | |
| parent | be8f2b0f79e42e595e6e45f17afc47e08acf23cc (diff) | |
Merge "Optimize Alpine Dockerfiles"
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/restapi/Dockerfile | 7 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 9 |
3 files changed, 11 insertions, 7 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index c70b36288..8b0a2f60c 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -7,7 +7,7 @@ COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ - openssl-dev libjpeg-turbo-dev git && \ + openssl-dev libjpeg-turbo-dev && \ pip install --no-cache-dir --src /src \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 4b447a228..2c7560286 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -9,11 +9,12 @@ ARG VIMS_TAG=stable COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ - ruby ruby-dev ruby-bundler ruby-irb ruby-rdoc dnsmasq \ - procps git g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ + ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ + procps libxslt libxml2 zlib libffi && \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ - openssl-dev libjpeg-turbo-dev git && \ + openssl-dev libjpeg-turbo-dev \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \ diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index d4f18c476..36e80d7e2 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -3,10 +3,13 @@ FROM opnfv/functest-core ARG VIMS_TAG=stable RUN apk --no-cache add --update \ - ruby ruby-dev ruby-bundler ruby-irb ruby-rdoc dnsmasq \ - procps git g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ + ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ + procps libxslt libxml2 zlib libffi && \ + apk --no-cache add --virtual .build-deps --update \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \ rm -r /src/vims-test/.git && \ - cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system + cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system && \ + apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml CMD ["bash","-c","prepare_env start && run_tests -t all"] |