Merge pull request #5 from Lorkster/master

Merging from master
Lorkster · Feb 9, 2016 · e968042 · e968042
2 parents 6bcdcd6 + 0050605
commit e968042
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -15,17 +15,24 @@
 # Easiest running of examples
 * Run: `mvn package`
 * Run the *-fat.jar for each respective module, for example: 
-`java -jar java -jar target/news-server-rb-1.0-SNAPSHOT-fat.jar -cp target/classes -cluster`  
+`java -jar target/news-server-rb-1.0-SNAPSHOT-fat.jar -cp target/classes -cluster`  
 
-# Docker Maven
+# Docker:
+
+* Running the Docker container locally might compromise your network interfaces and making the normal `java -jar xxx -cluster`
+usage not work. Just a heads up.
+
+
+## Docker Maven
   * `mvn clean package` in project root or any module, or `mvn docker:build` in any module (still needs `mvn package`to have been run). 
   * For each module you want to deploy in Docker run: `mvn docker:start`
   * To stop, simply do `mvn docker:stop` in the same module.
   * Alternatively you can use the Docker command line and start with:
     * `docker run -t -i -p 8080:8080 vertxdemo/frontend-js:1.0-SNAPSHOT`
     * `docker run -t -i vertxdemo/news-server-java:1.0-SNAPSHOT`
+  * Check your Docker container for it's ip and access frontend at that address i.e. <http://xxx.xxx.xxx.xxx:8080>.  
 
-# Docker Command Line
+## Docker Command Line
   * Currently hardcoded to a specific version of the fat jar, check in `Dockerfile`.
   * Install Docker... <https://www.docker.com/products/docker-toolbox>
   * Build by moving the each respective module and execute for example `docker build -t vertxdemo/frontend-js .`

diff --git a/frontend-js/pom.xml b/frontend-js/pom.xml
@@ -48,7 +48,7 @@
                 <configuration>
                     <images>
                         <image>
-                            <name>vertxdemo/${project.artifactId}:${project.version}</name>
+                            <name>${docker.namespace}/${project.artifactId}:${project.version}</name>
                             <build>
                                 <from>java:8</from>
                                 <tags>
@@ -71,7 +71,7 @@
                                 </assembly>
                             </build>
                             <run>
-                                <cmd>java -jar /opt/vertx/${project.artifactId}-${project.version}-fat.jar -cluster</cmd>
+                                <cmd>java -jar /opt/vertx/${project.artifactId}-${project.version}-fat.jar -ha</cmd>
                                 <ports>
                                     <port>8080:8080</port>
                                 </ports>

diff --git a/news-server-groovy/Dockerfile b/news-server-groovy/Dockerfile
@@ -0,0 +1,16 @@
+FROM java:8
+
+ENV VERTICLE_FILE news-server-groovy-1.0-SNAPSHOT-fat.jar
+
+# Set the location of the verticles
+ENV VERTICLE_HOME /usr/verticles
+
+#EXPOSE 8080
+
+# Copy your fat jar to the container
+COPY target/$VERTICLE_FILE $VERTICLE_HOME/
+
+# Launch the verticle
+WORKDIR $VERTICLE_HOME
+ENTRYPOINT ["sh", "-c"]
+CMD ["java -jar $VERTICLE_FILE -cluster"]
diff --git a/news-server-groovy/pom.xml b/news-server-groovy/pom.xml
@@ -21,6 +21,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.jolokia</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/news-server-groovy/src/main/docker/assembly.xml b/news-server-groovy/src/main/docker/assembly.xml
@@ -0,0 +1,11 @@
+<assembly>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <includes>
+                <include>${project.artifactId}-${project.version}-fat.jar</include>
+            </includes>
+            <outputDirectory>.</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/news-server-groovy/src/main/groovy/app/NewsServer.groovy b/news-server-groovy/src/main/groovy/app/NewsServer.groovy
@@ -12,7 +12,7 @@ import util.Runner
 class NewsServer extends AbstractVerticle{
 
     public static void main (String... args){
-        Runner.runClusteredExample(NewsServer.class)
+        Runner.runHaExample(NewsServer.class)
     }
 
     @Override

diff --git a/news-server-rb/src/main/rb/app/news_server.rb b/news-server-rb/src/main/rb/app/news_server.rb
@@ -1,5 +1,6 @@
 require 'vertx/vertx'
 options = {
+    'haEnabled' => true
 }
 Vertx::Vertx.clustered_vertx(options) { |res_err,res|
   if (res_err == nil)

diff --git a/pom.xml b/pom.xml
@@ -9,6 +9,7 @@
     <version>1.0-SNAPSHOT</version>
     <properties>
         <vertx.version>3.2.0</vertx.version>
+        <docker.namespace>vertxdemo</docker.namespace>
         <!-- must be set in each sub-project -->
         <main.verticle/>
     </properties>
@@ -112,7 +113,7 @@
                     <configuration>
                         <images>
                             <image>
-                                <name>vertxdemo/${project.artifactId}:${project.version}</name>
+                                <name>${docker.namespace}/${project.artifactId}:${project.version}</name>
                                 <build>
                                     <from>java:8</from>
                                     <tags>
@@ -135,7 +136,7 @@
                                     </assembly>
                                 </build>
                                 <run>
-                                    <cmd>java -jar /opt/vertx/${project.artifactId}-${project.version}-fat.jar -cluster</cmd>
+                                    <cmd>java -jar /opt/vertx/${project.artifactId}-${project.version}-fat.jar -ha</cmd>
                                 </run>
                             </image>
                         </images>