From ef4a3ff8933cf55410a75b4b7ade99d50626d4c1 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 29 Mar 2021 09:41:45 +0200 Subject: Refactor testapi's Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It cleans cache and useless packages at runtime. Signed-off-by: Cédric Ollivier Change-Id: Ifce2c49fe34e400368c111d7f4d9cd06dc6ac67e --- testapi/docker/Dockerfile | 45 +++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/testapi/docker/Dockerfile b/testapi/docker/Dockerfile index c589f8a..9fbeb8d 100644 --- a/testapi/docker/Dockerfile +++ b/testapi/docker/Dockerfile @@ -27,42 +27,23 @@ FROM ubuntu:18.04 MAINTAINER SerenaFeng LABEL version="v1" description="OPNFV TestAPI Docker container" -ENV HOME /home - ARG user=ubuntu ARG group=ubuntu # Packaged dependencies RUN apt-get update && apt-get install -y \ -curl \ -git \ -gcc \ -wget \ -python-dev \ -python-pip \ -python-wheel \ -python-setuptools \ -crudini \ -libxslt-dev \ -zlib1g-dev \ ---no-install-recommends - -RUN pip install --upgrade requests - -RUN groupadd -r $group && useradd -ms /bin/bash $user -g $group && \ - mkdir -p /home/ubuntu/releng-testresults && \ - chown -R $user:$group /home/ubuntu/releng-testresults - -RUN git config --global http.sslVerify false - -RUN git clone https://gerrit.opnfv.org/gerrit/releng-testresults /home/ubuntu/releng-testresults + curl git gcc wget python-dev python-pip python-wheel python-setuptools \ + crudini libxslt-dev zlib1g-dev --no-install-recommends && \ + groupadd -r $group && useradd -ms /bin/bash $user -g $group && \ + mkdir -p /home/ubuntu/releng-testresults && \ + chown -R $user:$group /home/ubuntu/releng-testresults && \ + git clone https://gerrit.opnfv.org/gerrit/releng-testresults \ + /home/ubuntu/releng-testresults && \ + pip install -r /home/ubuntu/releng-testresults/testapi/requirements.txt && \ + sed -i '152,152s/)/,\ verify=False)/g' \ + /usr/local/lib/python2.7/dist-packages/cas.py && \ + cd /home/ubuntu/releng-testresults/testapi/ && python setup.py install && \ + apt-get remove --purge -y python-dev libxslt-dev zlib1g-dev && \ + apt-get autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists/* WORKDIR /home/ubuntu/releng-testresults/testapi -RUN pip install -r requirements.txt - -# bugfix -# SSLError: hostname 'identity.linuxfoundation.org' doesn't match 'c.sni.fastly.net' -# hope it is a temprary, try to fix it in upstream python-cas lib -RUN sed -i '152,152s/)/,\ verify=False)/g' /usr/local/lib/python2.7/dist-packages/cas.py - -RUN python setup.py install CMD ["bash", "docker/start-server.sh"] -- cgit 1.2.3-korg