diff options
author | vrvarma <vikas.varma@att.com> | 2020-09-18 12:40:08 -0400 |
---|---|---|
committer | vrvarma <vikas.varma@att.com> | 2020-09-18 13:12:59 -0400 |
commit | cc7372eefd2cc1ec0737f765a2600396f13e13ab (patch) | |
tree | 0b608a0b4aef2b5d31243ac08661d0149483c691 /test/functest/simulators/Dockerfile | |
parent | a55cbabaef4975d5007363e59d4560cb30a855e3 (diff) |
Fix osdf csit failure by fixing logging
log.yml file needs to be updated for the osdf simulators after the python upgrade
simulator dockerfile and scripts updated
Change-Id: Ie6f59a602dc39db684e88357dc36ee81a2015da0
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-842
Diffstat (limited to 'test/functest/simulators/Dockerfile')
-rw-r--r-- | test/functest/simulators/Dockerfile | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/test/functest/simulators/Dockerfile b/test/functest/simulators/Dockerfile index ca32895..233503c 100644 --- a/test/functest/simulators/Dockerfile +++ b/test/functest/simulators/Dockerfile @@ -17,19 +17,22 @@ # ------------------------------------------------------------------------- # -FROM ubuntu:16.04 +FROM ubuntu:20.04 + +ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -y \ - && apt-get install -y vim unzip wget libmpfr-dev \ - && apt-get install -y git libqt5printsupport5 build-essential \ - && apt-get install -y python3 python3-setuptools python3-dev \ - && easy_install3 pip \ - && pip install --upgrade virtualenv pip wheel + && apt-get install -y --no-install-recommends software-properties-common \ + curl ca-certificates vim binutils binfmt-support build-essential \ + python3 python3-setuptools python3-dev \ + && ln -s /usr/bin/python3.8 /usr/bin/python \ + && curl -s https://bootstrap.pypa.io/get-pip.py | python \ + && python -m pip --no-cache-dir install --upgrade pip wheel setuptools \ + && rm -rf /var/lib/apt/lists/* -RUN ln -s /usr/bin/python3.5 /usr/bin/python -ADD requirements.txt /requirements.txt +COPY requirements.txt /requirements.txt RUN pip install -r requirements.txt -ADD sim /sim -ADD start_sim.sh /start_sim.sh +COPY sim /sim +COPY start_sim.sh /start_sim.sh CMD ["/start_sim.sh"]
\ No newline at end of file |