Merge branch 'master' of https://github.com/ScorpioBroker/ScorpioBroker

ScorpioBroker · Oct 21, 2019 · 8547d8e · 8547d8e
2 parents ba808d5 + a17a6be
commit 8547d8e
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 287 deletions.
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ The current maven build supports two types of docker container generations from
 
 The first profile is called 'docker' and can be called like this
 
-`mvn clean package -DskipTests -Pdocker`
+`sudo mvn clean package -DskipTests -Pdocker`
 
 this will generate individual docker containers for each micro service. The corresponding docker-compose file is docker-compose-dist.yml
 
@@ -82,7 +82,7 @@ The second profile is called 'docker-aaio' (for almost all in one). This will ge
 
 To get the aaio version run the maven build like this 
 
-`mvn clean package -DskipTests -Pdocker-aaio`
+`sudo mvn clean package -DskipTests -Pdocker-aaio`
 
 The corresponding docker-compose file is docker-compose-aaio.yml
 

diff --git a/docs/index.md b/docs/index.md
diff --git a/docs/index.rst b/docs/index.rst
@@ -15,6 +15,11 @@ Building
 Scorpio is developed in Java using SpringCloud as microservice framework and Apache Maven as build tool. 
 Some of the tests require a running Apache Kafka messagebus (further instruction are in the Setup chapter). If you want to skip those tests you can run "mvn clean package -DskipTests" to just build the individual microservices.
 
+Source code avilable at Github
+
+https://github.com/ScorpioBroker/ScorpioBroker
+
+
 Setup
 #####
 Scorpio requires two components to be installed.

diff --git a/target/NGSILDBroker-0.0.1-SNAPSHOT-docker-info.jar b/target/NGSILDBroker-0.0.1-SNAPSHOT-docker-info.jar
diff --git a/target/docker/image-id b/target/docker/image-id
@@ -0,0 +1 @@
+2058abead0f2
diff --git a/target/docker/image-name b/target/docker/image-name
@@ -0,0 +1 @@
+scorpiobroker/scorpio:scorpio-aaio
diff --git a/target/docker/repository b/target/docker/repository
@@ -0,0 +1 @@
+scorpiobroker/scorpio
diff --git a/target/docker/tag b/target/docker/tag
@@ -0,0 +1 @@
+scorpio-aaio
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.6.0
+groupId=eu.neclab.ngsildbroker
+artifactId=NGSILDBroker
+version=0.0.1-SNAPSHOT
diff --git a/target/test-classes/META-INF/docker/eu.neclab.ngsildbroker/NGSILDBroker/image-id b/target/test-classes/META-INF/docker/eu.neclab.ngsildbroker/NGSILDBroker/image-id
@@ -0,0 +1 @@
+2058abead0f2
diff --git a/target/test-classes/META-INF/docker/eu.neclab.ngsildbroker/NGSILDBroker/image-name b/target/test-classes/META-INF/docker/eu.neclab.ngsildbroker/NGSILDBroker/image-name
@@ -0,0 +1 @@
+scorpiobroker/scorpio:scorpio-aaio
diff --git a/target/test-classes/META-INF/docker/eu.neclab.ngsildbroker/NGSILDBroker/repository b/target/test-classes/META-INF/docker/eu.neclab.ngsildbroker/NGSILDBroker/repository
@@ -0,0 +1 @@
+scorpiobroker/scorpio
diff --git a/target/test-classes/META-INF/docker/eu.neclab.ngsildbroker/NGSILDBroker/tag b/target/test-classes/META-INF/docker/eu.neclab.ngsildbroker/NGSILDBroker/tag
@@ -0,0 +1 @@
+scorpio-aaio