aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsandovalfr <frank.sandoval@oamtechnologies.com>2019-03-14 17:07:14 -0600
committersandovalfr <frank.sandoval@oamtechnologies.com>2019-03-14 17:09:07 -0600
commit55cba2c427b87e404fb038f48fa53cf5537237a2 (patch)
tree674b046b0bda48918d9866280b124a14e8d356ad
parent8d21e71c13ab39ec01070fedaa298ff72e62da58 (diff)
build mutli-platform images
Issue-ID: INT-928 Change-Id: I05dcd3e7ed2c01bd74c6be4210c6e24dd4e72543 Signed-off-by: sandovalfr <frank.sandoval@oamtechnologies.com>
-rw-r--r--dbc-client/pom.xml3
-rw-r--r--dmaap-bc/pom.xml3
-rw-r--r--docs/Installation/Installation.rst41
-rw-r--r--pom.xml4
4 files changed, 47 insertions, 4 deletions
diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml
index 80defc5..d0945ac 100644
--- a/dbc-client/pom.xml
+++ b/dbc-client/pom.xml
@@ -202,9 +202,10 @@
<verbose>${docker.verbose}</verbose>
<apiVersion>${docker.apiVersion}</apiVersion>
<pullRegistry>${docker.pull.registry}</pullRegistry>
+ <pushRegistry>${docker.push.registry}</pushRegistry>
<images>
<image>
- <name>${onap.nexus.dockerregistry.daily}/${docker.image}</name>
+ <name>${docker.image}</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml
index e4b64ed..f621291 100644
--- a/dmaap-bc/pom.xml
+++ b/dmaap-bc/pom.xml
@@ -293,9 +293,10 @@
<verbose>${docker.verbose}</verbose>
<apiVersion>${docker.apiVersion}</apiVersion>
<pullRegistry>${docker.pull.registry}</pullRegistry>
+ <pushRegistry>${docker.push.registry}</pushRegistry>
<images>
<image>
- <name>${onap.nexus.dockerregistry.daily}/${docker.image}</name>
+ <name>${docker.image}</name>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
diff --git a/docs/Installation/Installation.rst b/docs/Installation/Installation.rst
index 5788845..6484459 100644
--- a/docs/Installation/Installation.rst
+++ b/docs/Installation/Installation.rst
@@ -30,3 +30,44 @@ However, if some customization is desired, there are places to change behavior:
3) oom/kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/buscontroller.env contains some environment settings for the container. These can be modified. For example, to indicate that AAF integration should be enabled, set USE_AAF=true in this file.
4) oom/kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/dmaapbc.properties contains many properties which can be modified. For example, if a differerent Postgresql instance needed to be used, the value could be specified here.
+
+Steps for local development and test
+------------------------
+On Intel dev machine, in terminal (> indicates prompt) :
+1) Build buscontroller images
+ > git clone https://gerrit.onap.org/r/dmaap/buscontroller
+ - anonymous http, can't push changes
+ > cd buscontroller
+ > mvn clean install -Pdocker
+ - builds dmaap-bc and dbc-client images
+2) Run tests
+ > cd dmaap-bc/src/main/resources/
+ > cp docker-databus-controller.conf /var/tmp/
+ - set docker preferences/file sharing to access /var/tmp
+ - edit docker-compose.yml
+ - remove "nexus3.onap.org:10001/" from dmaap-bc:image: and dbc-client:image: to
+ use local images
+ > docker-compose up -d
+ - create sample.txt file (as above)(content of file not important)
+ > curl http://localhost:30241/webapi/bridge
+
+On Arm:
+1) Build buscontroller images
+ > git clone https://gerrit.onap.org/r/dmaap/buscontroller
+ - anonymous http, can't push changes
+ > cd buscontroller
+ > mvn clean install -Pdocker -Ddocker.pull.registry=docker.io
+ - ensure we pull Arm version of base image
+2) Run tests
+ > cd dmaap-bc/src/main/resources/
+ > cp docker-databus-controller.conf /var/tmp/
+ - set docker preferences/file sharing to access /var/tmp
+ - edit docker-compose.yml
+ - remove "nexus3.onap.org:10001/" from dmaap-bc:image: and dbc-client:image: to
+ use local images
+ - replace 'crunchydata/crunchy-postgres:centos7-10.4-2.0.0' with
+ multi-platform 'postgres:9.6-alpine' normative image
+ > docker-compose up -d
+ - create sample.txt file (as above)(content of file not important)
+ > curl http://localhost:30241/webapi/bridge
+
diff --git a/pom.xml b/pom.xml
index e90cfec..c3e2587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,9 +43,9 @@
<build>
<plugins>
<plugin>
- <groupId>com.spotify</groupId>
+ <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${docker.maven.plugin.version}</version>
+ <version>0.28.0</version>
<configuration>
<skipDockerBuild>${skip.docker.build}</skipDockerBuild>
</configuration>