From: Tomasz Golabek Date: Mon, 1 Oct 2018 14:32:13 +0000 (+0200) Subject: Dockerfile generated via maven X-Git-Tag: 1.0.22~6 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fbuscontroller.git;a=commitdiff_plain;h=07fb4c0a995b1f66fb79a5ff6419542a9accaefe Dockerfile generated via maven Added creation of the Dockerfile inside the pom.xml Change-Id: I8d8b8e33aa1aaa33f20b8480c6831c5f00948be7 Issue-ID: DMAAP-828 Signed-off-by: Tomasz Golabek --- diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index b246871..0000000 --- a/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# -# ============LICENSE_START========================================== -# org.onap.dmaap -# =================================================================== -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. -# =================================================================== -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END============================================ -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -# -FROM java:openjdk-8-jre -MAINTAINER Dominic Lunanuova -ENV insdir /opt/app/dmaapbc -RUN \ - mkdir -p ${insdir}/lib \ - && mkdir -p ${insdir}/etc \ - && mkdir -p ${insdir}/logs \ - && mkdir -p ${insdir}/www && mkdir -p ${insdir}/www/doc \ - && mkdir -p ${insdir}/config \ - && mkdir -p ${insdir}/misc \ - && mkdir -p ${insdir}/bin -WORKDIR ${insdir} -USER root -COPY target/buscontroller.jar ${insdir}/lib/ -COPY misc/LocalKey ${insdir}/etc/ -COPY misc/logback.xml ${insdir}/etc/ -COPY misc/dbc-api.jks ${insdir}/etc/keystore -RUN chmod 600 ${insdir}/etc/keystore -COPY misc/org.onap.dmaap-bc.trust.jks ${insdir}/etc -RUN chmod 600 ${insdir}/etc/org.onap.dmaap-bc.trust.jks -COPY ./version.properties ${insdir}/etc -COPY misc/opensource.env ${insdir}/misc/ -COPY misc/*.tmpl ${insdir}/misc/ -COPY misc/cert-client-init.sh ${insdir}/misc/ -RUN chmod +x ${insdir}/misc/cert-client-init.sh -COPY misc/dmaapbc ${insdir}/bin/ -RUN chmod +x ${insdir}/bin/* -COPY misc/doaction ${insdir}/bin/ - -VOLUME ${insdir}/log -CMD ["./bin/dmaapbc", "deploy" ] diff --git a/misc/dmaapbc b/misc/dmaapbc index 0ade56b..cef472e 100644 --- a/misc/dmaapbc +++ b/misc/dmaapbc @@ -168,7 +168,7 @@ init() { while [ $rc != "200" ] do sleep 10 - rc=`curl -s -w "%{http_code}" -X GET -H "Content-Type: application/json" http://dmaap-bc:8080/webapi/dmaap` + rc=`curl -s -o /dev/null -I -w "%{http_code}" -X GET -H "Content-Type: application/json" http://dmaap-bc:8080/webapi/dmaap` echo "get dmaap response=${rc}" done diff --git a/pom.xml b/pom.xml index 46c811f..90cee24 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,8 @@ ============LICENSE_END============================================ ECOMP is a trademark and service mark of AT&T Intellectual Property. --> - + 4.0.0 org.onap.dmaap.buscontroller buscontroller @@ -31,7 +32,7 @@ 1.2.0 - + buscontroller @@ -50,13 +51,12 @@ No Snapshots Allowed! org.onap.dmaap.dbcapi:dbcapi - org.onap.aaf.authz:aaf-cadi-client - org.onap.aaf.authz:aaf-misc-env - org.onap.aaf.authz:aaf-cadi-aaf - org.onap.aaf.authz:aaf-auth-client - org.onap.aaf.authz:aaf-cadi-core - org.onap.aaf.authz:aaf-misc-rosetta - + org.onap.aaf.authz:aaf-cadi-client + org.onap.aaf.authz:aaf-misc-env + org.onap.aaf.authz:aaf-cadi-aaf + org.onap.aaf.authz:aaf-auth-client + org.onap.aaf.authz:aaf-cadi-core + org.onap.aaf.authz:aaf-misc-rosetta @@ -66,76 +66,73 @@ - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - - - package - - shade - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - org.onap.dmaap.dbcapi.server.Main - - - - - - - - - + - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ecomp-staging - ${nexusproxy} - 176c31dfe190a - - + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + + + package + + shade + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + org.onap.dmaap.dbcapi.server.Main + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ecomp-staging + ${nexusproxy} + 176c31dfe190a + + - - - org.apache.maven.plugins - maven-site-plugin - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - + + + org.apache.maven.plugins + maven-site-plugin + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + @@ -153,10 +150,10 @@ org.apache.maven.plugins maven-dependency-plugin [2.10,) - install - - copy-dependencies - + install + + copy-dependencies + @@ -169,49 +166,81 @@ - - - docker - - - - com.spotify - docker-maven-plugin - 1.0.0 - - ${onap.nexus.dockerregistry.daily}/${docker.image} - ${project.basedir} - ${onap.nexus.dockerregistry.daily} - - ${artifact.version} - latest - - true - - - / - ${project.basedir} - - target/**/* - pom.xml - - - - - / - ${project.build.directory} - **/** - - - - - - - - + + + docker + + + + com.spotify + docker-maven-plugin + 1.0.0 + + java:openjdk-8-jre + ${onap.nexus.dockerregistry.daily}/${docker.image} + ["./bin/dmaapbc", "deploy"] + ${onap.nexus.dockerregistry.daily} + + ${artifact.version} + latest + + + /opt/app/dmaapbc/log + + true + root + + + /opt/app/dmaapbc/lib + target + buscontroller.jar + + + /opt/app/dmaapbc/etc + misc + LocalKey + logback.xml + org.onap.dmaap-bc.trust.jks + dbc-api.jks + + + /opt/app/dmaapbc/etc + . + version.properties + + + /opt/app/dmaapbc/misc + misc + opensource.env + cert-client-init.sh + *.tmpl + + + /opt/app/dmaapbc/bin + misc + dmaapbc + doaction + + + + mv /opt/app/dmaapbc/etc/dbc-api.jks /opt/app/dmaapbc/etc/keystore + chmod 600 /opt/app/dmaapbc/etc/keystore + chmod 600 /opt/app/dmaapbc/etc/org.onap.dmaap-bc.trust.jks + chmod +x /opt/app/dmaapbc/misc/cert-client-init.sh + chmod +x /opt/app/dmaapbc/bin/* + mkdir /opt/app/dmaapbc/logs + mkdir /opt/app/dmaapbc/www + mkdir /opt/app/dmaapbc/www/doc + + /opt/app/dmaapbc + + + + + + - org.glassfish.jersey jersey-bom @@ -222,21 +251,21 @@ - - io.swagger - swagger-core - 1.5.13 - - - io.swagger - swagger-jersey2-jaxrs - 1.5.13 - - - io.swagger - swagger-annotations - 1.5.13 - + + io.swagger + swagger-core + 1.5.13 + + + io.swagger + swagger-jersey2-jaxrs + 1.5.13 + + + io.swagger + swagger-annotations + 1.5.13 + org.glassfish.jersey.containers jersey-container-servlet-core @@ -257,12 +286,12 @@ jetty-server ${jettyVersion} - - org.onap.aaf.authz - aaf-cadi-aaf - 2.1.2-SNAPSHOT - full - + + org.onap.aaf.authz + aaf-cadi-aaf + 2.1.2-SNAPSHOT + full + org.eclipse.jetty @@ -293,16 +322,16 @@ postgresql 9.4.1208.jre7 - - com.att.eelf - eelf-core - ${eelf.version} - - - org.onap.dmaap.dbcapi - dbcapi - 1.0.15-SNAPSHOT - + + com.att.eelf + eelf-core + ${eelf.version} + + + org.onap.dmaap.dbcapi + dbcapi + 1.0.15-SNAPSHOT + @@ -326,35 +355,35 @@ - - ecomp-site - dav:${nexusproxy}${sitePath} - + + ecomp-site + dav:${nexusproxy}${sitePath} + 2.16 UTF-8 9.3.8.RC0 0.0.1 - 1.0.19 - - 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec - target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + 1.0.20 + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** - - onap/dmaap/buscontroller + + onap/dmaap/buscontroller - https://nexus.onap.org - nexus3.onap.org:10003 + https://nexus.onap.org + nexus3.onap.org:10003 - - /content/sites/site/org/onap/dmaap/buscontroller/${artifact.version} + + /content/sites/site/org/onap/dmaap/buscontroller/${artifact.version} - Packaging Platform (DMaaP) Bus Controller API as a Docker container. + Packaging Platform (DMaaP) Bus Controller API as a Docker container. diff --git a/src/main/resources/docker-compose.yml b/src/main/resources/docker-compose.yml new file mode 100644 index 0000000..41bc473 --- /dev/null +++ b/src/main/resources/docker-compose.yml @@ -0,0 +1,25 @@ +version: '2' +services: + dbc-pg-primary: + image: crunchydata/crunchy-postgres:centos7-10.4-2.0.0 + ports: + - "5432:5432" + environment: + - PG_MODE=master + - PG_PRIMARY_USER="dmaap_admin" + - PG_PRIMARY_PASSWORD=onapdemodb + - PG_USER="dmaap_admin" + - PG_PASSWORD=onapdemodb + - PG_ROOT_PASSWORD=onapdemodb + - PG_DATABASE="dmaap" + - PG_PRIMARY_PORT=5432 + + dmaap-bc: + image: nexus3.onap.org:10001/onap/dmaap/buscontroller:latest + ports: + - "30241:8080" + - "30242:8443" + volumes: + - /var/tmp/docker-databus-controller.conf:/opt/app/config/conf + depends_on: + - dbc-pg-primary diff --git a/src/main/resources/docker-databus-controller.conf b/src/main/resources/docker-databus-controller.conf new file mode 100644 index 0000000..7214adf --- /dev/null +++ b/src/main/resources/docker-databus-controller.conf @@ -0,0 +1,12 @@ +DMAAPBC_WAIT_TO_EXIT=Y +DMAAPBC_PG_ENABLED=true +DMAAPBC_PGHOST=dbc-pg-primary +DMAAPBC_PGDBNAME=dmaap +DMAAPBC_PGCRED=onapdemodb +DMAAPBC_PGUSER=dmaap_admin +DMAAPBC_MR_CNAME=message-router +DMAAPBC_AAF_URL=https://aaf-authz/ +DMAAPBC_TOPICMGR_USER=m23456@dmaapbc.onap.org +DMAAPBC_TOPICMGR_PWD=onapdemo +DMAAPBC_ADMIN_USER=m12345@dmaapbc.onap.org +DMAAPBC_ADMIN_PWD=onapdemo \ No newline at end of file diff --git a/version.properties b/version.properties index 4a63197..b51743c 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=0 -patch=19 +patch=20 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins