Remove unwanted components from image

Remove unwanted linux components from the
docker image and move the common parts to
osdf-base image

Issue-ID: OPTFRA-853
Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com>
Change-Id: I1b2185781e187526bae114ad718c4758d373cee5

1 files changed, 11 insertions, 48 deletions

diff --git a/docker/opteng/Dockerfile b/docker/opteng/Dockerfile
index d8ffc4a..037771a 100644
--- a/docker/opteng/Dockerfile
+++ b/docker/opteng/Dockerfile
@@ -1,6 +1,7 @@
 #
 # -------------------------------------------------------------------------
 #   Copyright (c) 2020 AT&T Intellectual Property
+#   Copyright (C) 2021 Wipro Limited.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -17,63 +18,25 @@
 # -------------------------------------------------------------------------
 #
 
-FROM ubuntu:20.04
+FROM osdf-base:latest
 
-ARG MVN_ARTIFACT_VERSION
-ARG REPO
-ARG HTTP_PROXY=${HTTP_PROXY}
-ARG HTTPS_PROXY=${HTTPS_PROXY}
-ARG DEBIAN_FRONTEND=noninteractive
+EXPOSE 8699
 
-ENV http_proxy $HTTP_PROXY
-ENV https_proxy $HTTPS_PROXY
-
-ENV OSDF_PORT "8699"
-EXPOSE ${OSDF_PORT}
-
-RUN apt-get update -y \
-    && apt-get install -y --no-install-recommends software-properties-common wget \
-    curl ca-certificates vim unzip zip git 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/*
-
-ARG MZN_DL_URL=https://github.com/MiniZinc/MiniZincIDE/releases/download/2.4.3/MiniZincIDE-2.4.3-bundle-linux-x86_64.tgz
-ARG ORTOOLS_URL=https://github.com/google/or-tools/releases/download/v7.8/or-tools_ubuntu-20.04_v7.8.7959.tar.gz
-
-# Minizinc
-RUN wget -q $MZN_DL_URL -O /tmp/mz.tgz \
-    && mkdir -p /mz-dist && tar xzf /tmp/mz.tgz -C /mz-dist --strip-components 1\
-    && rm /tmp/mz.tgz
-
-RUN wget -q ${ORTOOLS_URL} -O /tmp/flatzinc.tar.gz \
-    && mkdir -p /ortools \
-    && tar zxf /tmp/flatzinc.tar.gz -C /ortools --strip-components 1 \
-    && rm /tmp/flatzinc.tar.gz
+# OSDF
+WORKDIR /opt/osdf
 
-ENV SHELL /bin/bash
-ENV PATH /mz-dist/bin:$PATH
+COPY onap-osdf-tm/requirements-opteng.txt /tmp/requirements-opteng.txt
 
-RUN groupadd onap \
-    && useradd -m -g onap onap
+RUN pip install --no-cache-dir -r /tmp/requirements-opteng.txt
 
-# OSDF
-WORKDIR /opt/osdf
-#RUN wget -O /opt/osdf.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=releases&g=org.onap.optf.osdf&a=optf-osdf&e=zip&v=1.3.4" && \
-#    unzip -q -o -B /opt/osdf.zip -d /opt/ && \
-#    rm -f /opt/osdf.zip
+COPY onap-osdf-tm/ /opt/osdf
 
-COPY onap-osdf-tm/optf-osdf-${MVN_ARTIFACT_VERSION}.zip /tmp/optf-osdf.zip
-COPY onap-osdf-tm/runtime /opt/osdf/runtime
-COPY onap-osdf-tm/requirements-opteng.txt .
-RUN unzip -q -o -B /tmp/optf-osdf.zip -d /opt/ && rm -f /tmp/optf-osdf.zip
 RUN mkdir -p /var/log/onap/optf/osdf/ \
     && chown onap:onap /var/log/onap -R \
     && chown onap:onap /opt/osdf -R
 
-RUN python -m pip install --no-cache-dir -r requirements.txt -r requirements-opteng.txt
-
 USER onap
 
-CMD [ "/opt/osdf/osdfapp.sh", "-x", "solverapp.py", "-c", "/opt/osdf/config/opteng_config.yaml" ]
+ENV OSDF_CONFIG_FILE "/opt/osdf/config/opteng_config.yaml"
+
+CMD [ "python", "solverapp.py" ]