From 6594205cdf4cad435a0d37d90820e83e14f5ccd5 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 25 Oct 2018 09:29:35 -0400 Subject: [PATCH] Fix CCSDK docker version Update CCSDK docker versions used to build SDNC docker containers. Change-Id: I927eefc2fe24fec88039548123a253d14c73b9a7 Issue-ID: SDNC-486 Signed-off-by: Timoney, Dan (dt5972) --- installation/admportal/pom.xml | 20 +- installation/admportal/src/main/docker/Dockerfile | 2 +- installation/ansible-server/pom.xml | 300 ++++++------- .../ansible-server/src/main/docker/Dockerfile | 2 +- installation/dgbuilder/pom.xml | 89 ++-- installation/dmaap-listener/pom.xml | 489 ++++++++++---------- .../dmaap-listener/src/main/docker/Dockerfile | 2 +- installation/sdnc/pom.xml | 9 +- installation/sdnc/src/main/docker/Dockerfile | 2 +- installation/ueb-listener/pom.xml | 493 +++++++++++---------- .../ueb-listener/src/main/docker/Dockerfile | 2 +- 11 files changed, 717 insertions(+), 693 deletions(-) diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 1edf61ec..0b0959c3 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -1,5 +1,6 @@ - @@ -20,7 +21,8 @@ onap/admportal-sdnc-image ${project.version} - yyyyMMdd'T'HHmmss'Z' + 0.3-STAGING-latest + yyyyMMdd'T'HHmmss'Z' @@ -41,18 +43,18 @@ println project.properties['sdnc.project.version']; def versionArray; if ( project.properties['sdnc.project.version'] != null ) { - versionArray = - project.properties['sdnc.project.version'].split('\\.'); + versionArray = + project.properties['sdnc.project.version'].split('\\.'); } - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) + { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; } - println 'New Tag for docker:' + - project.properties['project.docker.latesttag.version']; + println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile index fadb8120..abaa056f 100644 --- a/installation/admportal/src/main/docker/Dockerfile +++ b/installation/admportal/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version} +FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version} MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) # create link for pm2 diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index eb163621..7cc169f3 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -1,161 +1,165 @@ - + - - org.onap.ccsdk.parent - odlparent-lite - 1.1.2-SNAPSHOT - - 4.0.0 - pom - org.onap.sdnc.oam - installation-ansible-server - 1.4.2-SNAPSHOT + + org.onap.ccsdk.parent + odlparent-lite + 1.1.2-SNAPSHOT + + 4.0.0 + pom + org.onap.sdnc.oam + installation-ansible-server + 1.4.2-SNAPSHOT - sdnc-oam :: installation :: ${project.artifactId} - Creates ansible-server Docker container + sdnc-oam :: installation :: ${project.artifactId} + Creates ansible-server Docker container - - onap/sdnc-ansible-server-image - ${project.version} - ${https_proxy} - yyyyMMdd'T'HHmmss'Z' - + + onap/sdnc-ansible-server-image + ${project.version} + 0.3-STAGING-latest + ${https_proxy} + yyyyMMdd'T'HHmmss'Z' + - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); - } + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + + println project.properties['sdnc.project.version']; + def versionArray; + if ( project.properties['sdnc.project.version'] != null ) { + versionArray = + project.properties['sdnc.project.version'].split('\\.'); + } - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) - { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } + if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) + { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + } else { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + } - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - - - - - + println 'New Tag for docker:' + + project.properties['project.docker.latesttag.version']; + + + + + - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - - + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + - - copy-yml - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/ccsdk/Playbooks - - - src/main/yml - - * - - false - - - - - - - - + + copy-yml + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/ccsdk/Playbooks + + + src/main/yml + + * + + false + + + + + + + + - - - docker - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile - - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - - - - generate-images - package - - build - - + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + ${basedir}/target/docker-stage/Dockerfile + + ${project.version} + ${project.version}-STAGING-${maven.build.timestamp} + ${project.docker.latesttag.version} + + + + + + + + generate-images + package + + build + + - - push-images - deploy - - build - push - - - - - - - - - - ONAP - + + push-images + deploy + + build + push + + + + + + + + + + ONAP + diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile index ea9e61b7..0e59fba8 100644 --- a/installation/ansible-server/src/main/docker/Dockerfile +++ b/installation/ansible-server/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ansible-server-image:${ccsdk.distribution.version} +FROM onap/ccsdk-ansible-server-image:${ccsdk.docker.version} LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)" diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index a8b2ee14..44870fa3 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -1,5 +1,6 @@ - @@ -14,12 +15,13 @@ installation-dgbuilder 1.3.2-SNAPSHOT - sdnc-oam :: installation :: ${project.artifactId} + sdnc-oam :: installation :: ${project.artifactId} Creates docker container for dgbuilder onap/dgbuilder-sdnc-image ${project.version} + 0.3-STAGING-latest @@ -39,19 +41,26 @@ println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = - project.properties['sdnc.project.version'].split('\\.'); + def + versionArray; + if ( project.properties['sdnc.project.version'] != + null ) { + versionArray = + project.properties['sdnc.project.version'].split('\\.'); } - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + if + (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) + { + project.properties['project.docker.latesttag.version']=versionArray[0] + + '.' + versionArray[1] + "-STAGING-latest"; } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latesttag.version']=versionArray[0] + + '.' + versionArray[1] + "-STAGING-latest"; } - println 'New Tag for docker:' + + println 'New Tag + for docker:' + project.properties['project.docker.latesttag.version']; @@ -131,35 +140,35 @@ org.codehaus.mojo 1.5.0 - - Make-stage-dir - generate-sources - - exec - - - /bin/mkdir - - -p - ${basedir}/target/docker-stage/opt/onap/sdnc - - - - - Unzip dgbuilder - generate-sources - - exec - - - /usr/bin/unzip - - -d - ${basedir}/target/docker-stage/opt/onap/sdnc - ../../dgbuilder/target/*.zip - - - + + Make-stage-dir + generate-sources + + exec + + + /bin/mkdir + + -p + ${basedir}/target/docker-stage/opt/onap/sdnc + + + + + Unzip dgbuilder + generate-sources + + exec + + + /usr/bin/unzip + + -d + ${basedir}/target/docker-stage/opt/onap/sdnc + ../../dgbuilder/target/*.zip + + + Copy dgbuilder generate-sources @@ -195,7 +204,7 @@ change shell permissions - process-sources + process-sources exec diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 4470e9fb..d85699cd 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -1,245 +1,248 @@ - - - - org.onap.ccsdk.parent - odlparent-lite - 1.1.2-SNAPSHOT - - 4.0.0 - pom - org.onap.sdnc.oam - installation-dmaap-listener - 1.4.2-SNAPSHOT - - sdnc-oam :: installation :: ${project.artifactId} - Creates dmaap-listener Docker container - - - onap/sdnc-dmaap-listener-image - ${project.version} - ${https_proxy} - yyyyMMdd'T'HHmmss'Z' - - - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); - } - - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) - { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } - - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - - - - - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - - - - - copy-scripts - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/sdnc/dmaap-listener/bin - - - src/main/scripts - - *.sh - - false - - - - - - - copy-properties - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties - - - src/main/properties - - * - - false - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - - unpack - - initialize - - - - org.onap.ccsdk.sli.northbound - dmaap-listener - zip - ${ccsdk.sli.northbound.version} - - - ${basedir}/target/docker-stage/opt/onap/sdnc/dmaap-listener - bin/**,**/*-javadoc.jar,**/*-sources.jar - true - true - - - - - - - exec-maven-plugin - org.codehaus.mojo - 1.5.0 - - - - - - change shell permissions - process-sources - - exec - - - /usr/bin/find - - ${basedir}/target/docker-stage/opt/onap/sdnc - -name - *.sh - -exec - chmod - +x - {} - ; - - - - - - - - - - - - docker - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile - - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - - - - generate-images - package - - build - - - - - push-images - deploy - - build - push - - - - - - - - - - ONAP - + + + + org.onap.ccsdk.parent + odlparent-lite + 1.1.2-SNAPSHOT + + 4.0.0 + pom + org.onap.sdnc.oam + installation-dmaap-listener + 1.4.2-SNAPSHOT + + sdnc-oam :: installation :: ${project.artifactId} + Creates dmaap-listener Docker container + + + onap/sdnc-dmaap-listener-image + ${project.version} + 0.3-STAGING-latest + ${https_proxy} + yyyyMMdd'T'HHmmss'Z' + + + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + + println project.properties['sdnc.project.version']; + def versionArray; + if ( project.properties['sdnc.project.version'] != null ) { + versionArray = project.properties['sdnc.project.version'].split('\\.'); + } + + if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) + { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + } else { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + } + + println 'New Tag for docker:' + + project.properties['project.docker.latesttag.version']; + + + + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + + copy-scripts + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/sdnc/dmaap-listener/bin + + + src/main/scripts + + *.sh + + false + + + + + + + copy-properties + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties + + + src/main/properties + + * + + false + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + + unpack + + initialize + + + + org.onap.ccsdk.sli.northbound + dmaap-listener + zip + ${ccsdk.sli.northbound.version} + + + ${basedir}/target/docker-stage/opt/onap/sdnc/dmaap-listener + bin/**,**/*-javadoc.jar,**/*-sources.jar + true + true + + + + + + + exec-maven-plugin + org.codehaus.mojo + 1.5.0 + + + + + + change shell permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/opt/onap/sdnc + -name + *.sh + -exec + chmod + +x + {} + ; + + + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + ${basedir}/target/docker-stage/Dockerfile + + ${project.version} + ${project.version}-STAGING-${maven.build.timestamp} + ${project.docker.latesttag.version} + + + + + + + + generate-images + package + + build + + + + + push-images + deploy + + build + push + + + + + + + + + + ONAP + diff --git a/installation/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile index 49a70e4f..28676fac 100644 --- a/installation/dmaap-listener/src/main/docker/Dockerfile +++ b/installation/dmaap-listener/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version} +FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version} MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 3a21d88d..5adac80f 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -1,5 +1,6 @@ - @@ -21,6 +22,7 @@ onap/sdnc-image ${project.version} 1.4.2-SNAPSHOT + 0.3-STAGING-latest ${https_proxy} deploy true @@ -76,10 +78,11 @@ println project.properties['sdnc.project.version']; def versionArray; if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); + versionArray = project.properties['sdnc.project.version'].split('\\.'); } - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { + if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) + { project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; } else { project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 13a644e4..89e2aa01 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-odlsli-image:${ccsdk.distribution.version} +FROM onap/ccsdk-odlsli-image:${ccsdk.docker.version} MAINTAINER SDN-C Team (sdnc@lists.onap.org) diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 2c9180df..581271ba 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -1,247 +1,250 @@ - - - - org.onap.ccsdk.parent - odlparent-lite - 1.1.2-SNAPSHOT - - 4.0.0 - pom - org.onap.sdnc.oam - installation-ueb-listener - 1.4.2-SNAPSHOT - - sdnc-oam :: installation :: ${project.artifactId} - Creates ueb-listener Docker container - - - onap/sdnc-ueb-listener-image - ${project.version} - ${https_proxy} - deploy - yyyyMMdd'T'HHmmss'Z' - - - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); - } - - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) - { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } - - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - - - - - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - - - - - copy-scripts - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener/bin - - - src/main/scripts - - *.sh - - false - - - - - - - copy-properties - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties - - - src/main/properties - - * - - false - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - - unpack - - initialize - - - - org.onap.ccsdk.sli.northbound - ueb-listener - zip - ${ccsdk.sli.northbound.version} - - - ${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener - bin/**,**/*-javadoc.jar,**/*-sources.jar - true - true - - - - - - - exec-maven-plugin - org.codehaus.mojo - 1.5.0 - - - - - - change shell permissions - process-sources - - exec - - - /usr/bin/find - - ${basedir}/target/docker-stage/opt/onap/sdnc - -name - *.sh - -exec - chmod - +x - {} - ; - - - - - - - - - - - - docker - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile - - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - - - - generate-images - package - - build - - - - - push-images - - ${docker.push.phase} - - build - push - - - - - - - - - - ONAP - + + + + org.onap.ccsdk.parent + odlparent-lite + 1.1.2-SNAPSHOT + + 4.0.0 + pom + org.onap.sdnc.oam + installation-ueb-listener + 1.4.2-SNAPSHOT + + sdnc-oam :: installation :: ${project.artifactId} + Creates ueb-listener Docker container + + + onap/sdnc-ueb-listener-image + ${project.version} + 0.3-STAGING-latest + ${https_proxy} + deploy + yyyyMMdd'T'HHmmss'Z' + + + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + + println project.properties['sdnc.project.version']; + def versionArray; + if ( project.properties['sdnc.project.version'] != null ) { + versionArray = project.properties['sdnc.project.version'].split('\\.'); + } + + if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) + { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + } else { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + } + + println 'New Tag for docker:' + + project.properties['project.docker.latesttag.version']; + + + + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + + copy-scripts + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener/bin + + + src/main/scripts + + *.sh + + false + + + + + + + copy-properties + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties + + + src/main/properties + + * + + false + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + + unpack + + initialize + + + + org.onap.ccsdk.sli.northbound + ueb-listener + zip + ${ccsdk.sli.northbound.version} + + + ${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener + bin/**,**/*-javadoc.jar,**/*-sources.jar + true + true + + + + + + + exec-maven-plugin + org.codehaus.mojo + 1.5.0 + + + + + + change shell permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/opt/onap/sdnc + -name + *.sh + -exec + chmod + +x + {} + ; + + + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + ${basedir}/target/docker-stage/Dockerfile + + ${project.version} + ${project.version}-STAGING-${maven.build.timestamp} + ${project.docker.latesttag.version} + + + + + + + + generate-images + package + + build + + + + + push-images + + ${docker.push.phase} + + build + push + + + + + + + + + + ONAP + diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile index 49a70e4f..28676fac 100644 --- a/installation/ueb-listener/src/main/docker/Dockerfile +++ b/installation/ueb-listener/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version} +FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version} MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties -- 2.16.6