Cleanup POMs and Dockerfiles

Issue-ID: OPTFRA-539

Change-Id: I94da0bc947b4cbb226c5e248c85c8d87f799c659
Signed-off-by: Jerry Flood <jflood@att.com>

2 files changed, 18 insertions, 28 deletions

diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index 7f7d555..b982292 100644
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -41,30 +41,15 @@
 	<name>cmso-service</name>

 

 	<properties>

-		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>

-

-		<cmso.project.version>${project.version}</cmso.project.version>

-		<cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>

-

-		<release-tag>Dublin</release-tag>

 		<service.name>cmso</service.name>

 		<name.space>org.onap.optf.cmso</name.space>

 		<serviceArtifactName>cmso</serviceArtifactName>

 

-		<java.version>1.8</java.version>

-		<eelf.version>1.0.0</eelf.version>

-        <spring.version>5.1.5.RELEASE</spring.version>

-		<swagger.core.version>2.0.0</swagger.core.version>

-

-		<maven.compiler.target>1.8</maven.compiler.target>

-		<maven.compiler.source>1.8</maven.compiler.source>

 		<build.number>${maven.build.timestamp}</build.number>

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>

 		<mariadb.version>2.2.1</mariadb.version>

 		<swagger.directory>${basedir}/src/main/resources/META-INF/resources/swagger/</swagger.directory>

-        <aaf.version>2.1.4</aaf.version>

 

 		<!-- Sonar -->

 		<ilib.version>2.0.7</ilib.version>

@@ -78,8 +63,6 @@
 		<sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath>

 		<sonar.failsafe.reportsPath>${basedir}/target/failsafe-reports</sonar.failsafe.reportsPath>

 

-		<docker.push.registry>localhost:5000</docker.push.registry>

-		<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>

 		<docker.skip.build>false</docker.skip.build>

 		<docker.skip.push>false</docker.skip.push>

 		<docker.skip.tag>false</docker.skip.tag>

@@ -350,7 +333,7 @@
 					<apiVersion>1.23</apiVersion>

 					<images>

 						<image>

-							<name>onap/optf-cmso-service</name>

+							<name>${image.namespace}/optf-cmso-service</name>

 							<alias>onap-optf-cmso-service</alias>

 							<build>

 								<cleanup>true</cleanup>

@@ -364,6 +347,12 @@
 									<descriptor>${project.basedir}/src/main/docker/assembly/cmso-files.xml</descriptor>

 									<name>onap-cmso</name>

 								</assembly>

+								<args>

+									<!-- plugin cannot handle empty (no proxy) arguments

+									<http_proxy_arg>${docker.http_proxy}</http_proxy_arg>

+									<https_proxy_arg>${docker.https_proxy}</https_proxy_arg>

+									-->

+								</args>	

 							</build>

 						</image>

 					</images>

@@ -384,7 +373,7 @@
 							<goal>push</goal>

 						</goals>

 						<configuration>

-							<image>onap/optf-cmso-service:%l</image>

+							<image>${image.namespace}/optf-cmso-service:%l</image>

 						</configuration>

 					</execution>

 				</executions>

diff --git a/cmso-service/src/main/docker/Dockerfile b/cmso-service/src/main/docker/Dockerfile
index 97b8cba..18434e1 100644
--- a/cmso-service/src/main/docker/Dockerfile
+++ b/cmso-service/src/main/docker/Dockerfile
@@ -3,17 +3,18 @@ FROM ubuntu:16.04
 MAINTAINER "The Onap Team"

 LABEL Description="This image contains ubuntu 16.04 with the openjdk installed" Version="16.04-8"

 ENV APP_HOME=/opt/app/cmso

-ARG http_proxy

-ARG https_proxy

-ENV HTTP_PROXY=$http_proxy

-ENV HTTPS_PROXY=$https_proxy

+ARG http_proxy_arg

+ARG https_proxy_arg

+ENV HTTP_PROXY=$http_proxy_arg

+ENV HTTPS_PROXY=$https_proxy_arg

 ENV http_proxy=$HTTP_PROXY

 ENV https_proxy=$HTTPS_PROXY

 

 RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true &&  \

     apt-get update &&  \

     apt-get -y dist-upgrade &&  \

-    apt-get install -y openjdk-8-jre-headless

+    apt-get install -y openjdk-8-jre-headless && \

+	apt-get install -y curl

 

 COPY onap-cmso/cmso-service.jar ${APP_HOME}/app.jar

 

@@ -24,10 +25,10 @@ VOLUME /share/debug-logs
 COPY onap-cmso/startService.sh ${APP_HOME}/startService.sh

 COPY onap-cmso/data ${APP_HOME}/data

 

-RUN chmod 700 ${APP_HOME}/startService.sh

-RUN ln -s /share/etc ${APP_HOME}/etc

-RUN ln -s /share/logs ${APP_HOME}/logs

-RUN ln -s /share/debug-logs ${APP_HOME}/debug-logs

+RUN chmod 700 ${APP_HOME}/startService.sh && \

+    ln -s /share/etc ${APP_HOME}/etc && \

+    ln -s /share/logs ${APP_HOME}/logs && \

+    ln -s /share/debug-logs ${APP_HOME}/debug-logs

 

 WORKDIR ${APP_HOME}

 ENTRYPOINT ./startService.sh