Misc improvements to docker-compose files

build-docker-images.sh

@@ -2,5 +2,10 @@
 
 set -e
 
-(cd spring-boot-restful-service/docker ; ./build.sh)
-(cd  spring-boot-webapp/docker ; ./build.sh)
+cd spring-boot-restful-service
+
+./build-docker.sh
+
+cd ../spring-boot-webapp
+
+./build-docker.sh

clean-all.sh

@@ -0,0 +1,11 @@
+#! /bin/bash
+
+set -e
+
+cd spring-boot-restful-service
+
+./gradlew clean
+
+cd ../spring-boot-webapp
+
+./gradlew clean

docker-compose-images.yml

@@ -5,14 +5,19 @@ rabbitmq:
     - "15672:15672"
 
 eureka:
-  image: java:openjdk-8u91-jdk
-  working_dir: /app
-  volumes:
-    - ./eureka-server/build/libs:/app
-  command: java -jar /app/eureka-server.jar --server.port=8761
+  build: ./eureka-server
   ports:
     - "8761:8761"
 
+zipkin:
+  build: ./zipkin-server
+  links:
+    - rabbitmq
+  ports:
+    - "9411:9411"
+  environment:
+    RABBIT_HOST: rabbitmq
+
 mongodb:
   image: mongo:3.0.4
   ports:

docker-compose.yml

@@ -5,20 +5,12 @@ rabbitmq:
     - "15672:15672"
 
 eureka:
-  image: java:openjdk-8u91-jdk
-  working_dir: /app
-  volumes:
-    - ./eureka-server/build/libs:/app
-  command: java -jar /app/eureka-server.jar --server.port=8761
+  build: ./eureka-server
   ports:
     - "8761:8761"
 
 zipkin:
-  image: java:openjdk-8u91-jdk
-  working_dir: /app
-  volumes:
-    - ./zipkin-server/build/libs:/app
-  command: java -jar /app/zipkin-server.jar --server.port=9411
+  build: ./zipkin-server
   links:
     - rabbitmq
   ports:
@@ -33,11 +25,7 @@ mongodb:
   command: mongod --smallfiles
 
 restfulservice:
-  image: java:openjdk-8u91-jdk
-  working_dir: /app
-  volumes:
-    - ./spring-boot-restful-service/build/libs:/app
-  command: java -jar /app/spring-boot-restful-service.jar
+  build: ./spring-boot-restful-service
   ports:
     - "8081:8080"
   links:
@@ -55,11 +43,7 @@ restfulservice:
     SPRING_SLEUTH_SAMPLER_PERCENTAGE: 1
 
 web:
-  image: java:openjdk-8u91-jdk
-  working_dir: /app
-  volumes:
-    - ./spring-boot-webapp/build/libs:/app
-  command: java -jar /app/spring-boot-webapp.jar
+  build: ./spring-boot-webapp
   ports:
     - "8080:8080"
   links:

eureka-server/Dockerfile

@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java -jar eureka-server.jar --server.port=8761
+EXPOSE 8080
+COPY build/libs/eureka-server.jar .

spring-boot-restful-service/docker/Dockerfile → spring-boot-restful-service/Dockerfile

@@ -2,5 +2,4 @@ FROM java:openjdk-8u91-jdk
 MAINTAINER [email protected]
 EXPOSE 8080
 CMD java -jar spring-boot-restful-service.jar
-ADD build/spring-boot-restful-service.jar .
-
+ADD build/libs/spring-boot-restful-service.jar .

spring-boot-restful-service/build-docker.sh

@@ -0,0 +1,4 @@
+#! /bin/bash -e
+
+./gradlew assemble
+docker build -t sb_rest_svc .

spring-boot-webapp/docker/Dockerfile → spring-boot-webapp/Dockerfile

@@ -2,4 +2,4 @@ FROM java:openjdk-8u91-jdk
 MAINTAINER [email protected]
 EXPOSE 8080
 CMD java -jar spring-boot-webapp.jar
-ADD build/spring-boot-webapp.jar .
+ADD build/libs/spring-boot-webapp.jar .

spring-boot-webapp/build-docker.sh

@@ -0,0 +1,4 @@
+#! /bin/bash -e
+
+./gradlew assemble
+docker build -t sb_web .

zipkin-server/Dockerfile

@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java -jar zipkin-server.jar --server.port=9411
+EXPOSE 8080
+COPY build/libs/zipkin-server.jar .