X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=23f9add362a1568bc9ab8d9faea8832352ed9342;hb=8ce4f0cb5acc8af28a7ed0ff101bb2b2804cf73e;hp=a4ca7210d5e98e82ca99ff97fad5b32b24f36a9b;hpb=d4513e022d7d75d9967072cec1e0d7db34571120;p=pti%2Fo2.git

diff --git a/Dockerfile b/Dockerfile
index a4ca721..23f9add 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,44 +1,87 @@
-FROM python:3.10-slim-buster
-
-RUN apt-get update; apt-get install -y git gcc
-
-# in case git repo is not accessable
-# RUN mkdir -p /cgtsclient
-# COPY temp/config /cgtsclient/
-RUN git clone https://opendev.org/starlingx/config.git /cgtsclient
-RUN pip install -e /cgtsclient/sysinv/cgts-client/cgts-client/
-
-# RUN mkdir -p /distcloud-client
-# COPY temp/distcloud-client /distcloud-client/
-RUN git clone https://opendev.org/starlingx/distcloud-client.git /distcloud-client/
-RUN pip install -e /distcloud-client/distributedcloud-client
-# in case git repo is not accessable
-
-
-COPY requirements.txt /tmp/
-COPY requirements-stx.txt /tmp/
-COPY constraints.txt /tmp/
-
-RUN  pip install -r /tmp/requirements.txt -c /tmp/constraints.txt
-
-# RUN  pip install -r /tmp/requirements-stx.txt
-
-COPY requirements-test.txt /tmp/
-RUN pip install -r /tmp/requirements-test.txt
-
-
-RUN mkdir -p /src
-COPY o2ims/ /src/o2ims/
-COPY o2dms/ /src/o2dms/
-COPY o2common/ /src/o2common/
-COPY setup.py /src/
-
-RUN pip install -e /src
-
-COPY configs/ /etc/o2/
-
-COPY tests/ /tests/
-
-RUN apt-get install -y procps vim
-
-WORKDIR /src
+FROM nexus3.onap.org:10001/onap/integration-python:10.1.0
+# https://nexus3.onap.org/#browse/search=keyword%3Dintegration-python:d406d405e4cfbf1186265b01088caf9a
+# https://git.onap.org/integration/docker/onap-python/tree/Dockerfile
+
+USER root
+
+ARG user=orano2
+ARG group=orano2
+# Create a group and user
+RUN addgroup -S $group && adduser -S -D -h /home/$user $user $group && \
+    chown -R $user:$group /home/$user &&  \
+    mkdir /var/log/$user && \
+    mkdir -p /src && \
+    mkdir -p /configs/ && \
+    mkdir -p /src/o2app/ && \
+    mkdir -p /src/helm_sdk/ && \
+    mkdir -p /etc/o2/ && \
+    chown -R $user:$group /var/log/$user && \
+    chown -R $user:$group /src && \
+    chown -R $user:$group /configs && \
+    chown -R $user:$group /etc/o2/
+
+COPY requirements.txt /tmp/
+COPY requirements-stx.txt /tmp/
+COPY constraints.txt /tmp/
+
+
+COPY o2ims/ /src/o2ims/
+COPY o2dms/ /src/o2dms/
+COPY o2common/ /src/o2common/
+COPY o2app/ /src/o2app/
+COPY setup.py /src/
+
+COPY helm_sdk/ /src/helm_sdk/
+
+COPY configs/ /etc/o2/
+COPY configs/ /configs/
+
+RUN set -ex \
+    && apk add --no-cache bash \
+	&& apk add --no-cache --virtual .fetch2-deps \
+        git curl \
+    && apk add --no-cache --virtual .build2-deps  \
+		bluez-dev \
+		bzip2-dev \
+		dpkg-dev dpkg \
+		expat-dev \
+		gcc \
+		libc-dev \
+		libffi-dev \
+		libnsl-dev \
+		libtirpc-dev \
+		linux-headers \
+		make \
+		ncurses-dev \
+		openssl-dev \
+		pax-utils \
+		sqlite-dev \
+		tcl-dev \
+		tk \
+		tk-dev \
+		util-linux-dev \
+		xz-dev \
+		zlib-dev \
+    && pip install -r /tmp/requirements.txt -r /tmp/requirements-stx.txt -c /tmp/constraints.txt \
+    && curl -O https://get.helm.sh/helm-v3.3.1-linux-amd64.tar.gz; \
+        tar -zxvf helm-v3.3.1-linux-amd64.tar.gz; \
+        cp linux-amd64/helm /usr/local/bin; \
+        rm -f helm-v3.3.1-linux-amd64.tar.gz \
+    && pip install -e /src \
+    && apk del --no-network .fetch2-deps \
+    && apk del --no-network .build2-deps
+
+# && pip install -r /tmp/requirements.txt -r /tmp/requirements-stx.txt -c /tmp/constraints.txt
+# RUN apt-get update && apt-get install -y git gcc procps vim curl ssh
+# && git clone --depth 1 --branch r/stx.7.0 https://opendev.org/starlingx/config.git /cgtsclient \
+# && git clone --depth 1 --branch r/stx.7.0 https://opendev.org/starlingx/distcloud-client.git /distcloud-client/ \
+# && git clone --depth 1 --branch r/stx.7.0 https://opendev.org/starlingx/fault.git /faultclient \
+# && pip install -e /cgtsclient/sysinv/cgts-client/cgts-client \
+# && pip install -e /distcloud-client/distributedcloud-client \
+# && pip install -e /faultclient/python-fmclient/fmclient \
+# && rm -rf /cgtsclient /distcloud-client /faultclient
+
+WORKDIR /src
+
+# USER $user
+ENV PYTHONHASHSEED=0