Cleanup POMs and Dockerfiles

Issue-ID: OPTFRA-539

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

diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml
index dddd293..7c92055 100644 (file)
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -55,8 +55,6 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
                \r
-               <docker.push.registry>localhost:5000</docker.push.registry>\r
-               <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>\r
                <docker.skip.build>false</docker.skip.build>\r
                <docker.skip.push>false</docker.skip.push>\r
                <docker.skip.tag>false</docker.skip.tag>\r
@@ -147,7 +145,7 @@
                                        <apiVersion>1.23</apiVersion>\r
                                        <images>\r
                                                                <image>\r
-                                                                               <name>onap/optf-cmso-dbinit</name>\r
+                                                                               <name>${image.namespace}/optf-cmso-dbinit</name>\r
                                                                                <alias>onap-optf-cmso-dbinit</alias>\r
                                                                                <build>\r
                                                                                                <cleanup>true</cleanup>\r
@@ -161,6 +159,12 @@
                                                                                                                <descriptor>${project.basedir}/src/main/docker/assembly/cmso-files.xml</descriptor>\r
                                                                                                                <name>onap-cmso</name>\r
                                                                                                </assembly>\r
+                                                                                               <args>\r
+                                                                                                       <!-- plugin cannot handle empty (no proxy) arguments\r
+                                                                                                       <http_proxy_arg>${docker.http_proxy}</http_proxy_arg>\r
+                                                                                                       <https_proxy_arg>${docker.https_proxy}</https_proxy_arg>\r
+                                                                                                       -->\r
+                                                                                               </args> \r
                                                                                </build>\r
                                                                </image>\r
                                        </images>\r
@@ -181,7 +185,7 @@
                                                        <goal>push</goal>\r
                                                </goals>\r
                                                <configuration>\r
-                                                       <image>onap/optf-cmso-dbinit:%l</image>\r
+                                                       <image>${image.namespace}/optf-cmso-dbinit:%l</image>\r
                                                </configuration>\r
                                        </execution>\r
                                </executions>\r

diff --git a/cmso-database/src/main/docker/Dockerfile b/cmso-database/src/main/docker/Dockerfile
index 8837ee7..f1e617b 100644 (file)
--- a/cmso-database/src/main/docker/Dockerfile
+++ b/cmso-database/src/main/docker/Dockerfile
@@ -3,24 +3,26 @@ 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-dbinit
-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/docker-liquibase.jar ${APP_HOME}/app.jar
 COPY onap-cmso/startService.sh ${APP_HOME}/startService.sh
 
-RUN chmod 700 ${APP_HOME}/startService.sh
-RUN ln -s /share/etc ${APP_HOME}/etc
-RUN ln -s /share/logs ${APP_HOME}/logs
+RUN chmod 700 ${APP_HOME}/startService.sh && \
+    ln -s /share/etc ${APP_HOME}/etc && \
+    ln -s /share/logs ${APP_HOME}/logs
 
 VOLUME /share/etc
 VOLUME /share/logs

diff --git a/cmso-optimizer/pom.xml b/cmso-optimizer/pom.xml
index 4ffa2e9..c3d8de8 100644 (file)
--- a/cmso-optimizer/pom.xml
+++ b/cmso-optimizer/pom.xml
@@ -30,30 +30,15 @@
        <name>cmso-optimizer</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>
-
                <service.name>cmso</service.name>
-               <release-tag>Dublin</release-tag>
                <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>
@@ -67,8 +52,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>
@@ -335,13 +318,13 @@
                        <plugin>
                                <groupId>io.fabric8</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.26.0</version>
+                               <version>${docker.maven.plugin.version}</version>
                                <configuration>
                                        <verbose>true</verbose>
                                        <apiVersion>1.23</apiVersion>
                                        <images>
                                                <image>
-                                                       <name>onap/optf-cmso-optimizer</name>
+                                                       <name>${image.namespace}/optf-cmso-optimizer</name>
                                                        <alias>onap-optf-cmso-optimizer</alias>
                                                        <build>
                                                                <cleanup>true</cleanup>
@@ -355,6 +338,12 @@
                                                                        <descriptor>${project.basedir}/src/main/docker/assembly/cmso-files.xml</descriptor>
                                                                        <name>onap-cmso-optimizer</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>
@@ -375,7 +364,7 @@
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>
-                                                       <image>onap/optf-cmso-optimizer:%l</image>
+                                                       <image>${image.namespace}/optf-cmso-optimizer:%l</image>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/cmso-optimizer/src/main/docker/Dockerfile b/cmso-optimizer/src/main/docker/Dockerfile
index fde2caf..7ce5303 100644 (file)
--- a/cmso-optimizer/src/main/docker/Dockerfile
+++ b/cmso-optimizer/src/main/docker/Dockerfile
@@ -3,10 +3,11 @@ 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
 
@@ -16,19 +17,18 @@ ENV MZN_UNZIPNAME MiniZincIDE-${MZN}-bundle-linux
 ENV MZN_GH_BASE https://github.com/MiniZinc/MiniZincIDE
 ENV MZN_DL_URL ${MZN_GH_BASE}/releases/download/${MZN}/${MZN_BASENAME}.tgz
 
-RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true &&  \
+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 wget
-
-
-# Minizinc
-RUN wget -q $MZN_DL_URL -O mz.tgz
-RUN tar xzf mz.tgz
-RUN mv $MZN_UNZIPNAME /mz-dist
-RUN rm mz.tgz
-RUN echo PATH=/mz-dist:$PATH >> ~/.bashrc
+    apt-get install -y wget && \
+    apt-get install -y curl && \
+    set && \
+    wget -q $MZN_DL_URL -O mz.tgz && \
+    tar xzf mz.tgz && \
+    mv $MZN_UNZIPNAME /mz-dist && \
+    rm mz.tgz && \
+    echo PATH=/mz-dist:$PATH >> ~/.bashrc
 
 
 COPY onap-cmso-optimizer/cmso-optimizer.jar ${APP_HOME}/app.jar
@@ -41,10 +41,10 @@ COPY onap-cmso-optimizer/startService.sh ${APP_HOME}/startService.sh
 COPY onap-cmso-optimizer/data ${APP_HOME}/data
 COPY onap-cmso-optimizer/scripts ${APP_HOME}/scripts
 
-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 

diff --git a/cmso-robot/docker/Dockerfile b/cmso-robot/docker/Dockerfile
index 7f8eb81..70f0578 100644 (file)
--- a/cmso-robot/docker/Dockerfile
+++ b/cmso-robot/docker/Dockerfile
@@ -5,18 +5,22 @@ MAINTAINER "CMSO"
 LABEL name="Docker image for the CMSO Robot Testing Framework"
 LABEL usage="docker run -e <testname> optf-cmso-robot"
 
-RUN apt-get update
-RUN apt-get install -y software-properties-common vim
-RUN add-apt-repository ppa:jonathonf/python-3.6
-RUN apt-get update
-RUN apt-get install -y build-essential python3.6 python3.6-dev python3-pip python3.6-venv
-
-# update pip
-RUN python3.6 -m pip install pip --upgrade
-RUN python3.6 -m pip install wheel
-
-RUN apt-get update \
-    && apt-get install \
+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 "$" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true && \
+    apt-get update  && \
+    apt-get install -y software-properties-common vim && \
+    add-apt-repository ppa:jonathonf/python-3.6 && \
+    apt-get update && \
+    apt-get install -y build-essential python3.6 python3.6-dev python3-pip python3.6-venv  && \
+       python3.6 -m pip install pip --upgrade && \
+    python3.6 -m pip install wheel  && \
+    apt-get install \
         --no-install-recommends \
         --assume-yes \
             chromium-browser \
@@ -30,21 +34,16 @@ COPY /onap-cmso/robot /opt/cmso-robot/robot
 COPY /onap-cmso/mocking /opt/cmso-robot/mocking
 
 COPY /onap-cmso/ete.sh /opt/cmso-robot
-RUN chmod 777 /opt/cmso-robot/ete.sh
 
-COPY /onap-cmso/server.py /opt/cmso-robot
-
-
-RUN ln -s /usr/bin/python3.6 /usr/bin/python
-RUN python --version
-RUN pip --version
-RUN pip install robotframework==3.1.1
-
-RUN pip install Flask
-RUN pip install requests
-RUN pip install selenium
-RUN pip install robotframework-sshlibrary
-RUN pip install robotframework-requests
+RUN ln -s /usr/bin/python3.6 /usr/bin/python && \
+    python --version && \
+    pip --version && \
+    pip install robotframework==3.1.1 && \
+    pip install Flask && \
+    pip install requests && \
+    pip install selenium && \
+    pip install robotframework-sshlibrary && \
+    pip install robotframework-requests
 
 ### Start up the mock server for 
 CMD ["/usr/bin/python", "/opt/cmso-robot/mocking/mock.py"]

diff --git a/cmso-robot/pom.xml b/cmso-robot/pom.xml
index 0a7696b..8137e74 100644 (file)
--- a/cmso-robot/pom.xml
+++ b/cmso-robot/pom.xml
@@ -34,23 +34,12 @@
        <description>Robot Framework for testing CMSO  Service</description>\r
 \r
        <properties>\r
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>\r
-\r
-               <cmso.project.version>${project.version}</cmso.project.version>\r
-               <cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>\r
-\r
-               <release-tag>Dublin</release-tag>\r
                <service.name>cmso-robot</service.name>\r
-               <name.space>org.onap.optf</name.space>\r
                <serviceArtifactName>cmso-robot</serviceArtifactName>\r
 \r
                <build.number>${maven.build.timestamp}</build.number>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>\r
-\r
-               <docker.push.registry>localhost:5000</docker.push.registry>\r
-               <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>\r
                <docker.skip.build>false</docker.skip.build>\r
                <docker.skip.push>false</docker.skip.push>\r
                <docker.skip.tag>false</docker.skip.tag>\r
@@ -96,7 +85,7 @@
                                        <apiVersion>1.23</apiVersion>\r
                                        <images>\r
                                                <image>\r
-                                                       <name>onap/optf-cmso-robot</name>\r
+                                                       <name>${image.namespace}/optf-cmso-robot</name>\r
                                                        <alias>onap-optf-cmso-robot</alias>\r
                                                        <build>\r
                                                                <cleanup>true</cleanup>\r
@@ -110,7 +99,12 @@
                                                                        <descriptor>${project.basedir}/docker/assembly/cmso-files.xml</descriptor>\r
                                                                        <name>onap-cmso</name>\r
                                                                </assembly>\r
-\r
+                                                               <args>\r
+                                                                       <!-- plugin cannot handle empty (no proxy) arguments\r
+                                                                       <http_proxy_arg>${docker.http_proxy}</http_proxy_arg>\r
+                                                                       <https_proxy_arg>${docker.https_proxy}</https_proxy_arg>\r
+                                                                       -->\r
+                                                               </args> \r
                                                        </build>\r
                                                </image>\r
                                        </images>\r
@@ -131,7 +125,7 @@
                                                        <goal>push</goal>\r
                                                </goals>\r
                                                <configuration>\r
-                                                       <image>onap/optf-cmso-robot:%l</image>\r
+                                                       <image>${image.namespace}/optf-cmso-robot:%l</image>\r
                                                </configuration>\r
                                        </execution>\r
                                </executions>\r

diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index 7f7d555..b982292 100644 (file)
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -41,30 +41,15 @@
        <name>cmso-service</name>\r
 \r
        <properties>\r
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>\r
-\r
-               <cmso.project.version>${project.version}</cmso.project.version>\r
-               <cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>\r
-\r
-               <release-tag>Dublin</release-tag>\r
                <service.name>cmso</service.name>\r
                <name.space>org.onap.optf.cmso</name.space>\r
                <serviceArtifactName>cmso</serviceArtifactName>\r
 \r
-               <java.version>1.8</java.version>\r
-               <eelf.version>1.0.0</eelf.version>\r
-        <spring.version>5.1.5.RELEASE</spring.version>\r
-               <swagger.core.version>2.0.0</swagger.core.version>\r
-\r
-               <maven.compiler.target>1.8</maven.compiler.target>\r
-               <maven.compiler.source>1.8</maven.compiler.source>\r
                <build.number>${maven.build.timestamp}</build.number>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>\r
                <mariadb.version>2.2.1</mariadb.version>\r
                <swagger.directory>${basedir}/src/main/resources/META-INF/resources/swagger/</swagger.directory>\r
-        <aaf.version>2.1.4</aaf.version>\r
 \r
                <!-- Sonar -->\r
                <ilib.version>2.0.7</ilib.version>\r
@@ -78,8 +63,6 @@
                <sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath>\r
                <sonar.failsafe.reportsPath>${basedir}/target/failsafe-reports</sonar.failsafe.reportsPath>\r
 \r
-               <docker.push.registry>localhost:5000</docker.push.registry>\r
-               <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>\r
                <docker.skip.build>false</docker.skip.build>\r
                <docker.skip.push>false</docker.skip.push>\r
                <docker.skip.tag>false</docker.skip.tag>\r
@@ -350,7 +333,7 @@
                                        <apiVersion>1.23</apiVersion>\r
                                        <images>\r
                                                <image>\r
-                                                       <name>onap/optf-cmso-service</name>\r
+                                                       <name>${image.namespace}/optf-cmso-service</name>\r
                                                        <alias>onap-optf-cmso-service</alias>\r
                                                        <build>\r
                                                                <cleanup>true</cleanup>\r
@@ -364,6 +347,12 @@
                                                                        <descriptor>${project.basedir}/src/main/docker/assembly/cmso-files.xml</descriptor>\r
                                                                        <name>onap-cmso</name>\r
                                                                </assembly>\r
+                                                               <args>\r
+                                                                       <!-- plugin cannot handle empty (no proxy) arguments\r
+                                                                       <http_proxy_arg>${docker.http_proxy}</http_proxy_arg>\r
+                                                                       <https_proxy_arg>${docker.https_proxy}</https_proxy_arg>\r
+                                                                       -->\r
+                                                               </args> \r
                                                        </build>\r
                                                </image>\r
                                        </images>\r
@@ -384,7 +373,7 @@
                                                        <goal>push</goal>\r
                                                </goals>\r
                                                <configuration>\r
-                                                       <image>onap/optf-cmso-service:%l</image>\r
+                                                       <image>${image.namespace}/optf-cmso-service:%l</image>\r
                                                </configuration>\r
                                        </execution>\r
                                </executions>\r

diff --git a/cmso-service/src/main/docker/Dockerfile b/cmso-service/src/main/docker/Dockerfile
index 97b8cba..18434e1 100644 (file)
--- 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"\r
 LABEL Description="This image contains ubuntu 16.04 with the openjdk installed" Version="16.04-8"\r
 ENV APP_HOME=/opt/app/cmso\r
-ARG http_proxy\r
-ARG https_proxy\r
-ENV HTTP_PROXY=$http_proxy\r
-ENV HTTPS_PROXY=$https_proxy\r
+ARG http_proxy_arg\r
+ARG https_proxy_arg\r
+ENV HTTP_PROXY=$http_proxy_arg\r
+ENV HTTPS_PROXY=$https_proxy_arg\r
 ENV http_proxy=$HTTP_PROXY\r
 ENV https_proxy=$HTTPS_PROXY\r
 \r
 RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true &&  \\r
     apt-get update &&  \\r
     apt-get -y dist-upgrade &&  \\r
-    apt-get install -y openjdk-8-jre-headless\r
+    apt-get install -y openjdk-8-jre-headless && \\r
+       apt-get install -y curl\r
 \r
 COPY onap-cmso/cmso-service.jar ${APP_HOME}/app.jar\r
 \r
@@ -24,10 +25,10 @@ VOLUME /share/debug-logs
 COPY onap-cmso/startService.sh ${APP_HOME}/startService.sh\r
 COPY onap-cmso/data ${APP_HOME}/data\r
 \r
-RUN chmod 700 ${APP_HOME}/startService.sh\r
-RUN ln -s /share/etc ${APP_HOME}/etc\r
-RUN ln -s /share/logs ${APP_HOME}/logs\r
-RUN ln -s /share/debug-logs ${APP_HOME}/debug-logs\r
+RUN chmod 700 ${APP_HOME}/startService.sh && \\r
+    ln -s /share/etc ${APP_HOME}/etc && \\r
+    ln -s /share/logs ${APP_HOME}/logs && \\r
+    ln -s /share/debug-logs ${APP_HOME}/debug-logs\r
 \r
 WORKDIR ${APP_HOME}\r
 ENTRYPOINT ./startService.sh \r

diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml
index 95d41bb..05c58a4 100644 (file)
--- a/cmso-sonar/pom.xml
+++ b/cmso-sonar/pom.xml
@@ -34,23 +34,15 @@
        <description>Maven Porject for Running CMSO CSIT for Code Coverage</description>\r
 \r
        <properties>\r
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>\r
-\r
-               <cmso.project.version>${project.version}</cmso.project.version>\r
-               <cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>\r
 \r
                <service.name>cmso-sonar</service.name>\r
-               <release-tag>Dublin</release-tag>\r
                <name.space>org.onap.optf</name.space>\r
                <serviceArtifactName>cmso-sonar</serviceArtifactName>\r
 \r
                <build.number>${maven.build.timestamp}</build.number>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>\r
 \r
-               <docker.push.registry>localhost:5000</docker.push.registry>\r
-               <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>\r
                <docker.skip.build>false</docker.skip.build>\r
                <docker.skip.push>false</docker.skip.push>\r
                <docker.skip.tag>false</docker.skip.tag>\r

diff --git a/cmso-ticketmgt/pom.xml b/cmso-ticketmgt/pom.xml
index 33d4ca5..e0ee828 100644 (file)
--- a/cmso-ticketmgt/pom.xml
+++ b/cmso-ticketmgt/pom.xml
@@ -30,29 +30,15 @@
        <name>cmso-ticketmgt</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>
@@ -66,8 +52,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>
@@ -329,7 +313,7 @@
                                        <apiVersion>1.23</apiVersion>
                                        <images>
                                                <image>
-                                                       <name>onap/optf-cmso-ticketmgt</name>
+                                                       <name>${image.namespace}/optf-cmso-ticketmgt</name>
                                                        <alias>onap-optf-cmso-tciketmgt</alias>
                                                        <build>
                                                                <cleanup>true</cleanup>
@@ -343,6 +327,12 @@
                                                                        <descriptor>${project.basedir}/src/main/docker/assembly/cmso-files.xml</descriptor>
                                                                        <name>onap-cmso-tm</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>
@@ -363,7 +353,7 @@
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>
-                                                       <image>onap/optf-cmso-ticketmgt:%l</image>
+                                                       <image>${image.namespace}/optf-cmso-ticketmgt:%l</image>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/cmso-ticketmgt/src/main/docker/Dockerfile b/cmso-ticketmgt/src/main/docker/Dockerfile
index 3555d62..7dd0faa 100644 (file)
--- a/cmso-ticketmgt/src/main/docker/Dockerfile
+++ b/cmso-ticketmgt/src/main/docker/Dockerfile
@@ -3,17 +3,19 @@ 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-tm/cmso-ticketmgt.jar ${APP_HOME}/app.jar
 
@@ -24,10 +26,10 @@ VOLUME /share/debug-logs
 COPY onap-cmso-tm/startService.sh ${APP_HOME}/startService.sh
 COPY onap-cmso-tm/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 

diff --git a/cmso-topology/pom.xml b/cmso-topology/pom.xml
index b450960..e27960a 100644 (file)
--- a/cmso-topology/pom.xml
+++ b/cmso-topology/pom.xml
@@ -30,30 +30,15 @@
        <name>cmso-topology</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>
@@ -67,8 +52,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>
@@ -316,13 +299,13 @@
                        <plugin>
                                <groupId>io.fabric8</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.26.0</version>
+                               <version>${docker.maven.plugin.version}</version>
                                <configuration>
                                        <verbose>true</verbose>
                                        <apiVersion>1.23</apiVersion>
                                        <images>
                                                <image>
-                                                       <name>onap/optf-cmso-topology</name>
+                                                       <name>${image.namespace}/optf-cmso-topology</name>
                                                        <alias>onap-optf-cmso-topology</alias>
                                                        <build>
                                                                <cleanup>true</cleanup>
@@ -336,6 +319,12 @@
                                                                        <descriptor>${project.basedir}/src/main/docker/assembly/cmso-files.xml</descriptor>
                                                                        <name>onap-cmso-topology</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>
@@ -356,7 +345,7 @@
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>
-                                                       <image>onap/optf-cmso-topology:%l</image>
+                                                       <image>${image.namespace}/optf-cmso-topology:%l</image>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/cmso-topology/src/main/docker/Dockerfile b/cmso-topology/src/main/docker/Dockerfile
index 4c663b4..e428a02 100644 (file)
--- a/cmso-topology/src/main/docker/Dockerfile
+++ b/cmso-topology/src/main/docker/Dockerfile
@@ -3,17 +3,19 @@ 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-topology/cmso-topology.jar ${APP_HOME}/app.jar
 
@@ -24,10 +26,10 @@ VOLUME /share/debug-logs
 COPY onap-cmso-topology/startService.sh ${APP_HOME}/startService.sh
 COPY onap-cmso-topology/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 

diff --git a/pom.xml b/pom.xml
index 729b8f7..765b015 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,15 @@
                <spring.boot.version>2.1.6.RELEASE</spring.boot.version>\r
                <release-tag>Dublin</release-tag>\r
                <name.space>org.onap.optf</name.space>\r
+               <image.namespace>onap</image.namespace>\r
+               <eelf.version>1.0.0</eelf.version>\r
+               <swagger.core.version>2.0.0</swagger.core.version>\r
+               <aaf.version>2.1.4</aaf.version>\r
+               <docker.push.registry>localhost:5000</docker.push.registry>\r
+               <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>\r
+               <docker.http_proxy></docker.http_proxy>\r
+               <docker.https_proxy></docker.https_proxy>\r
+               <docker.maven.plugin.version>0.30.0</docker.maven.plugin.version>\r
        </properties>\r
        \r
     <scm>\r