Merge branch 'upstream'

Author: BretFisher

docker-compose-javaworker.yml

@@ -14,7 +14,7 @@ services:
 
   result:
     build: ./result
-    command: nodemon --debug server.js
+    command: nodemon server.js
     volumes:
       - ./result:/app
     ports:

result/Dockerfile

@@ -1,14 +1,16 @@
-FROM node:8.9-slim
+FROM node:8.9-alpine
 
+RUN mkdir -p /app
 WORKDIR /app
 
 RUN npm install -g nodemon
-ADD package.json /app/package.json
-RUN npm config set registry http://registry.npmjs.org
-RUN npm install && npm ls
-RUN mv /app/node_modules /node_modules
-
-ADD . /app
+RUN npm config set registry https://registry.npmjs.org
+COPY package.json /app/package.json
+RUN npm install \
+ && npm ls \
+ && npm cache clean --force \
+ && mv /app/node_modules /node_modules
+COPY . /app
 
 ENV PORT 80
 EXPOSE 80

result/tests/tests.sh

@@ -1,14 +1,20 @@
 #!/bin/sh
-while ! timeout 1 bash -c "echo > /dev/tcp/vote/80"; do sleep 1; done
+
+while ! timeout 1 bash -c "echo > /dev/tcp/vote/80"; do
+    sleep 1
+done
+
 curl -sS -X POST --data "vote=b" http://vote > /dev/null
 sleep 10
+
 if phantomjs render.js http://result | grep -q '1 vote'; then
-  echo -e "\e[42m------------"
-  echo -e "\e[92mTests passed"
-  echo -e "\e[42m------------"
+  echo -e "\\e[42m------------"
+  echo -e "\\e[92mTests passed"
+  echo -e "\\e[42m------------"
   exit 0
-fi
-  echo -e "\e[41m------------"
-  echo -e "\e[91mTests failed"
-  echo -e "\e[41m------------"
+else
+  echo -e "\\e[41m------------"
+  echo -e "\\e[91mTests failed"
+  echo -e "\\e[41m------------"
   exit 1
+fi

worker/Dockerfile.j

@@ -1,19 +1,17 @@
-FROM java:openjdk-8-jdk-alpine
-
-RUN MAVEN_VERSION=3.3.3 \
- && cd /usr/share \
- && wget http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz -O - | tar xzf - \
- && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven \
- && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+FROM maven:3.5-jdk-8-alpine AS build
 
 WORKDIR /code
 
-ADD pom.xml /code/pom.xml
+COPY pom.xml /code/pom.xml
 RUN ["mvn", "dependency:resolve"]
 RUN ["mvn", "verify"]
 
 # Adding source, compile and package into a fat jar
-ADD src/main /code/src/main
+COPY ["src/main", "/code/src/main"]
 RUN ["mvn", "package"]
 
-CMD ["java", "-jar", "target/worker-jar-with-dependencies.jar"]
+FROM openjdk:8-jre-alpine
+
+COPY --from=build /code/target/worker-jar-with-dependencies.jar /
+
+CMD ["java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-jar", "/worker-jar-with-dependencies.jar"]