Merge pull request #2 from microservices-demo/test-build

test build

Author: nustiueudinastea

.travis.yml

@@ -1,17 +1,14 @@
-language: java
 sudo: required
 services:
   - docker
-jdk:
-  - oraclejdk8
 install: true
 
 env:
   - GROUP=weaveworksdemos COMMIT=$TRAVIS_COMMIT TAG=$TRAVIS_TAG REPO=msd-java;
 
 script:
   - set -e
-  - travis_wait ./scripts/build.sh;
+  - ./scripts/build.sh;
 
 after_success:
   - set -e;

Dockerfile

@@ -13,4 +13,8 @@ RUN	addgroup -g ${SERVICE_GID} ${SERVICE_GROUP} && \
 	ln -s /usr/lib/jvm/java-1.8-openjdk/lib/amd64/jli/libjli.so /lib/libjli.so && \
 	setcap 'cap_net_bind_service=+ep' $(readlink -f $(which java))
 
-COPY java.sh /usr/local/bin/java.sh
+COPY java.sh /usr/local/bin/java.sh
+
+ARG BUILD_DATE
+ARG BUILD_VERSION
+ARG COMMIT

README.md

@@ -1,2 +1,2 @@
 # msd-java
-A base image for all the Java based services
+A base image for all the Java based services.

scripts/build.sh

@@ -29,4 +29,4 @@ $DOCKER_CMD build \
     --build-arg BUILD_VERSION=$BUILD_VERSION \
     --build-arg BUILD_DATE=$BUILD_DATE \
     --build-arg COMMIT=$COMMIT \
-    -t ${DOCKER_REPO}:${COMMIT} $CODE_DIR/Dockerfile;
+    -t ${DOCKER_REPO}:${COMMIT} $CODE_DIR;