From 3bd3e44e2c9533b96f6f6664f9d6ed2150515955 Mon Sep 17 00:00:00 2001
From: Bin Yang <bin.yang@windriver.com>
Date: Thu, 10 Mar 2022 15:35:13 +0800
Subject: Rebase docker image to remove GPLv3 issue

Rebase to onap/integration-python:9.1.0 which is python3.9

Issue-ID: MULTICLOUD-1224

Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I8d2a33769d89a6bea0d01ddacd362f597fe8d8ce
---
 fcaps/docker/Dockerfile     | 7 +++++--
 pike/docker/Dockerfile      | 6 ++++--
 starlingx/docker/Dockerfile | 7 +++++--
 windriver/docker/Dockerfile | 7 +++++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile
index 80d6ca4e..3de775a7 100644
--- a/fcaps/docker/Dockerfile
+++ b/fcaps/docker/Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.8-alpine
+# FROM python:3.8-alpine
+FROM nexus3.onap.org:10001/onap/integration-python:9.1.0
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -17,7 +18,9 @@ ENV AAI_PASSWORD "AAI"
 
 EXPOSE 9011
 
-RUN addgroup -S onap && adduser -S -G onap onap
+# RUN addgroup -S onap && adduser -S -G onap onap
+USER root
+
 # COPY ./ /opt/fcaps/
 COPY ./multicloud-openstack-fcaps-*.zip /opt/multicloud-openstack-fcaps.zip
 
diff --git a/pike/docker/Dockerfile b/pike/docker/Dockerfile
index bf632ce4..7ce54023 100644
--- a/pike/docker/Dockerfile
+++ b/pike/docker/Dockerfile
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM python:3.8-alpine
+# FROM python:3.8-alpine
+FROM nexus3.onap.org:10001/onap/integration-python:9.1.0
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -32,7 +33,8 @@ ENV AAI_PASSWORD "AAI"
 
 EXPOSE 9007
 
-RUN addgroup -S onap && adduser -S -G onap onap
+# RUN addgroup -S onap && adduser -S -G onap onap
+USER root
 
 COPY ./multicloud-openstack-pike-*.zip /opt/multicloud-openstack-pike.zip
 RUN apk update && \
diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile
index a5da24d9..79b351d3 100644
--- a/starlingx/docker/Dockerfile
+++ b/starlingx/docker/Dockerfile
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM python:3.8-alpine
+# FROM python:3.8-alpine
+FROM nexus3.onap.org:10001/onap/integration-python:9.1.0
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -32,7 +33,9 @@ ENV AAI_PASSWORD "AAI"
 
 EXPOSE 9009
 
-RUN addgroup -S onap && adduser -S -G onap onap
+# RUN addgroup -S onap && adduser -S -G onap onap
+USER root
+
 # COPY ./ /opt/
 COPY ./multicloud-openstack-starlingx-*.zip /opt/multicloud-openstack-starlingx.zip
 RUN apk update && \
diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile
index ae438f50..0f26f13b 100644
--- a/windriver/docker/Dockerfile
+++ b/windriver/docker/Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.8-alpine
+# FROM python:3.8-alpine
+FROM nexus3.onap.org:10001/onap/integration-python:9.1.0
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -17,7 +18,9 @@ ENV AAI_PASSWORD "AAI"
 
 EXPOSE 9005
 
-RUN addgroup -S onap && adduser -S -G onap onap
+# RUN addgroup -S onap && adduser -S -G onap onap
+USER root
+
 # COPY ./ /opt/windriver/
 COPY ./multicloud-openstack-windriver-*.zip /opt/multicloud-openstack-windriver.zip
 RUN apk update && \
-- 
cgit 1.2.3-korg