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 /cmso-database | |
| parent | 8d79b30fed898ede2b551a579e3564cb196f707b (diff) | |
Cleanup POMs and Dockerfiles
Issue-ID: OPTFRA-539
Change-Id: I94da0bc947b4cbb226c5e248c85c8d87f799c659
Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'cmso-database')
| -rw-r--r-- | cmso-database/pom.xml | 12 | ||||
| -rw-r--r-- | cmso-database/src/main/docker/Dockerfile | 18 |
2 files changed, 18 insertions, 12 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 |