diff options
author | Jerry Flood <jflood@att.com> | 2019-07-26 12:48:41 -0400 |
---|---|---|
committer | Jerry Flood <jflood@att.com> | 2019-07-26 12:48:56 -0400 |
commit | 05d1e18373779df333d1f1fa30cc4891a8da59a4 (patch) | |
tree | 1477ee93ac6c3e618926ed009fe6cdd19dce9207 | |
parent | 8d79b30fed898ede2b551a579e3564cb196f707b (diff) |
Cleanup POMs and Dockerfiles
Issue-ID: OPTFRA-539
Change-Id: I94da0bc947b4cbb226c5e248c85c8d87f799c659
Signed-off-by: Jerry Flood <jflood@att.com>
-rw-r--r-- | cmso-database/pom.xml | 12 | ||||
-rw-r--r-- | cmso-database/src/main/docker/Dockerfile | 18 | ||||
-rw-r--r-- | cmso-optimizer/pom.xml | 29 | ||||
-rw-r--r-- | cmso-optimizer/src/main/docker/Dockerfile | 36 | ||||
-rw-r--r-- | cmso-robot/docker/Dockerfile | 51 | ||||
-rw-r--r-- | cmso-robot/pom.xml | 22 | ||||
-rw-r--r-- | cmso-service/pom.xml | 27 | ||||
-rw-r--r-- | cmso-service/src/main/docker/Dockerfile | 19 | ||||
-rw-r--r-- | cmso-sonar/pom.xml | 8 | ||||
-rw-r--r-- | cmso-ticketmgt/pom.xml | 26 | ||||
-rw-r--r-- | cmso-ticketmgt/src/main/docker/Dockerfile | 20 | ||||
-rw-r--r-- | cmso-topology/pom.xml | 29 | ||||
-rw-r--r-- | cmso-topology/src/main/docker/Dockerfile | 20 | ||||
-rw-r--r-- | pom.xml | 9 |
14 files changed, 144 insertions, 182 deletions
diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml index dddd293..7c92055 100644 --- a/cmso-database/pom.xml +++ b/cmso-database/pom.xml @@ -55,8 +55,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <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>
@@ -147,7 +145,7 @@ <apiVersion>1.23</apiVersion>
<images>
<image>
- <name>onap/optf-cmso-dbinit</name>
+ <name>${image.namespace}/optf-cmso-dbinit</name>
<alias>onap-optf-cmso-dbinit</alias>
<build>
<cleanup>true</cleanup>
@@ -161,6 +159,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>
@@ -181,7 +185,7 @@ <goal>push</goal>
</goals>
<configuration>
- <image>onap/optf-cmso-dbinit:%l</image>
+ <image>${image.namespace}/optf-cmso-dbinit:%l</image>
</configuration>
</execution>
</executions>
diff --git a/cmso-database/src/main/docker/Dockerfile b/cmso-database/src/main/docker/Dockerfile index 8837ee7..f1e617b 100644 --- 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 --- 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 --- 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 --- 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 --- a/cmso-robot/pom.xml +++ b/cmso-robot/pom.xml @@ -34,23 +34,12 @@ <description>Robot Framework for testing CMSO Service</description>
<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-robot</service.name>
- <name.space>org.onap.optf</name.space>
<serviceArtifactName>cmso-robot</serviceArtifactName>
<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>
-
- <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>
@@ -96,7 +85,7 @@ <apiVersion>1.23</apiVersion>
<images>
<image>
- <name>onap/optf-cmso-robot</name>
+ <name>${image.namespace}/optf-cmso-robot</name>
<alias>onap-optf-cmso-robot</alias>
<build>
<cleanup>true</cleanup>
@@ -110,7 +99,12 @@ <descriptor>${project.basedir}/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>
@@ -131,7 +125,7 @@ <goal>push</goal>
</goals>
<configuration>
- <image>onap/optf-cmso-robot:%l</image>
+ <image>${image.namespace}/optf-cmso-robot:%l</image>
</configuration>
</execution>
</executions>
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
diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml index 95d41bb..05c58a4 100644 --- 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>
<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-sonar</service.name>
- <release-tag>Dublin</release-tag>
<name.space>org.onap.optf</name.space>
<serviceArtifactName>cmso-sonar</serviceArtifactName>
<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>
- <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>
diff --git a/cmso-ticketmgt/pom.xml b/cmso-ticketmgt/pom.xml index 33d4ca5..e0ee828 100644 --- 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 --- 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 --- 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 --- 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 @@ -66,6 +66,15 @@ <spring.boot.version>2.1.6.RELEASE</spring.boot.version>
<release-tag>Dublin</release-tag>
<name.space>org.onap.optf</name.space>
+ <image.namespace>onap</image.namespace>
+ <eelf.version>1.0.0</eelf.version>
+ <swagger.core.version>2.0.0</swagger.core.version>
+ <aaf.version>2.1.4</aaf.version>
+ <docker.push.registry>localhost:5000</docker.push.registry>
+ <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+ <docker.http_proxy></docker.http_proxy>
+ <docker.https_proxy></docker.https_proxy>
+ <docker.maven.plugin.version>0.30.0</docker.maven.plugin.version>
</properties>
<scm>
|