From: Vijay Venkatesh Kumar <vv770d@att.com>
Date: Tue, 10 Aug 2021 18:55:06 +0000 (+0000)
Subject: Revert "VES-Mapper container running as root"
X-Git-Tag: 1.3.0~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F122918%2F2;p=dcaegen2%2Fservices%2Fmapper.git

Revert "VES-Mapper container running as root"

This reverts commit 0c18ab77bea0b7851a1df2a0f5339dddb41928b9.
Reason for revert: docker build job failure

Issue-ID: DCAEGEN2-2859
Change-Id: Iae0cc611418da893093df7fba54b8a626bf28c2d
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
---

diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml
index 44329f3..604c1b2 100644
--- a/UniversalVesAdapter/pom.xml
+++ b/UniversalVesAdapter/pom.xml
@@ -43,8 +43,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>11</java.version>
 		<docker.image.name>onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor</docker.image.name>
-		<docker.user.name>VESAdapter</docker.user.name>
-		<docker.user.dir>/opt/app/VESAdapter</docker.user.dir>
+
 		<!-- PLUGIN SETTINGS -->
 		<dependency.locations.enabled>false</dependency.locations.enabled>
 
@@ -334,11 +333,11 @@
 						<imageTag>${project.version}</imageTag>
 						<imageTag>latest</imageTag>
 					</imageTags>
-					<baseImage>onap/integration-java11:9.0.0</baseImage>
+					<baseImage>openjdk:11-jre-slim</baseImage>
 					<env>
 						<HOSTALIASES>/etc/host.aliases</HOSTALIASES>
 					</env>
-					<workdir>${docker.user.dir}</workdir>
+					<workdir>/opt/app/VESAdapter</workdir>
 					<resources>
 						<resource>
 							<targetPath>.</targetPath>
@@ -346,19 +345,17 @@
 						</resource>
 					</resources>
 					<runs>
-						<run>useradd -r -U ${docker.user.name}</run>
-						<run>chown -R ${docker.user.name}:${docker.user.name} ${docker.user.dir}</run>
-						<run>chmod +x ${docker.user.dir}/bin/run.sh</run>
+						<run>chmod +x bin/run.sh</run>
 						<run>
 							<![CDATA[apt-get update && apt-get install -y --no-install-recommends procps && apt-get install -y vim && apt-get install -y curl && apt-get clean all]]>
 						</run>
 					</runs>
-					<cmd>${docker.user.dir}/bin/run.sh</cmd>
 					<exposes>
 						<expose>8080</expose>
 						<expose>8443</expose>
 					</exposes>
-					<user>${docker.user.name}</user>
+					<entryPoint>bin/run.sh</entryPoint>
+
 				</configuration>
 				<!--<executions> <execution> <id>build-image</id> <phase>package</phase> 
 					<goals> <goal>build</goal> </goals> </execution> <execution> <id>tag-and-push-image-latest</id>