aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2021-08-10 18:55:06 +0000
committerVijay Venkatesh Kumar <vv770d@att.com>2021-08-10 19:07:37 +0000
commite57d9b6e87560713a5ec71ec683b82b5c8603b33 (patch)
tree912f7c6cc8b727ba4fc00e7a24e6680a31fc23f6
parent0c18ab77bea0b7851a1df2a0f5339dddb41928b9 (diff)
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>
-rw-r--r--UniversalVesAdapter/pom.xml15
1 files changed, 6 insertions, 9 deletions
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>