diff options
| author |   vrvarma <vikas.varma@att.com> | 2020-03-19 20:02:54 -0400 |
|---|---|---|
| committer | vrvarma <vikas.varma@att.com> | 2020-03-20 00:17:24 -0400 |
| commit | 6f3312c6576eefdbac120214b1adc0f150b72d98 (patch) | |
| tree | ccd11c7e51b6c1c61828b39c957f3bc712fbed46 /docker | |
| parent | d39860b859417c1a7773f39ad8db311848ec0676 (diff) | |
fix csit, cleanup dockerfile for osdf
Change-Id: Ie3d44592a382ba8e886c2a7544520cbed6971f84
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-722
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/opteng/Dockerfile | 11 | ||||
| -rw-r--r-- | docker/osdf/Dockerfile | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/docker/opteng/Dockerfile b/docker/opteng/Dockerfile index 9dca3e7..bd58f35 100644 --- a/docker/opteng/Dockerfile +++ b/docker/opteng/Dockerfile @@ -38,8 +38,10 @@ ENV MZN_DL_URL ${MZN_GH_BASE}/releases/download/${MZN}/${MZN_BASENAME}-x86_64.tg RUN apk update && apk upgrade \ && apk --no-cache --update add --virtual build-deps openssl wget \ && apk --no-cache --update add less ca-certificates bash libxslt-dev unzip \ - freetype freetype-dev libstdc++ build-base libc6-compat \ - && ln -s /lib/libc.musl-x86_64.so.1 /lib/ld-linux-x86-64.so.2 + freetype freetype-dev libstdc++ build-base libc6-compat lapack-dev openblas-dev \ + && ln -s /lib/libc.musl-x86_64.so.1 /lib/ld-linux-x86-64.so.2 \ + && pip install --no-cache-dir --upgrade pip wheel setuptools \ + && pip install --no-cache-dir Cython numpy==1.17.3 scipy==1.3.1 # Minizinc RUN wget -q $MZN_DL_URL -O mz.tgz \ @@ -49,7 +51,7 @@ RUN wget -q $MZN_DL_URL -O mz.tgz \ && echo PATH=/mz-dist/bin:$PATH >> ~/.bashrc ENV SHELL /bin/bash -ENV PATH /mz-dist:$PATH +ENV PATH /mz-dist/bin:$PATH RUN addgroup -S onap && adduser -S -G onap onap @@ -67,7 +69,8 @@ RUN mkdir -p /var/log/onap/optf/osdf/ \ && chown onap:onap /var/log/onap -R \ && chown onap:onap /opt/osdf -R -RUN pip install --no-cache-dir -r requirements.txt -r requirements-opteng.txt +RUN pip install --no-cache-dir -r requirements.txt -r requirements-opteng.txt\ + && apk del build-deps && rm -rf /var/cache/apk/* USER onap diff --git a/docker/osdf/Dockerfile b/docker/osdf/Dockerfile index 5860df2..5a14a04 100644 --- a/docker/osdf/Dockerfile +++ b/docker/osdf/Dockerfile @@ -36,11 +36,11 @@ ENV MZN_GH_BASE https://github.com/MiniZinc/MiniZincIDE ENV MZN_DL_URL ${MZN_GH_BASE}/releases/download/${MZN}/${MZN_BASENAME}-x86_64.tgz 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 \ + && apt-get install -y --no-install-recommends vim unzip wget libmpfr-dev ca-certificates\ + && apt-get install -y --no-install-recommends git libqt5printsupport5 build-essential \ + && apt-get install -y --no-install-recommends python3 python3-setuptools python3-dev \ && easy_install3 pip \ - && pip install --upgrade virtualenv pip wheel setuptools + && pip install --no-cache-dir --upgrade virtualenv pip wheel setuptools && rm -rf /var/lib/apt/lists/* RUN ln -s /usr/bin/python3.5 /usr/bin/python @@ -52,7 +52,7 @@ RUN wget -q $MZN_DL_URL -O /tmp/mz.tgz \ && echo PATH=/mz-dist/bin:$PATH >> ~/.bashrc ENV SHELL /bin/bash -ENV PATH /mz-dist:$PATH +ENV PATH /mz-dist/bin:$PATH # OSDF WORKDIR /opt/osdf |