Port play java tests to docker (#3370)

.travis.yml

@@ -91,8 +91,8 @@ env:
      - "TESTDIR=Java/minijax"
      - "TESTDIR=Java/netty"
      - "TESTDIR=Java/ninja-standalone"
-    # - "TESTDIR=Java/play1"
-    # - "TESTDIR=Java/play2-java"
+     - "TESTDIR=Java/play1"
+     - "TESTDIR=Java/play2-java"
      - "TESTDIR=Java/proteus"
      - "TESTDIR=Java/rapidoid"
      - "TESTDIR=Java/restexpress"

frameworks/Java/play1/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "play1",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/db?queries=",

frameworks/Java/play1/conf/application.conf

@@ -115,14 +115,14 @@ db.pool.minSize=10
 # generic "destroy" method :
 # db.destroyMethod=close
 db.driver= com.mysql.jdbc.Driver
-db.url=jdbc:mysql://127.0.0.1:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true&useSSL=false
-#db.url=jdbc:mysql://127.0.0.1:3306/hello_world
+db.url=jdbc:mysql://TFB-database:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true&useSSL=false
+#db.url=jdbc:mysql://TFB-database:3306/hello_world
 db.user=benchmarkdbuser
 db.pass=benchmarkdbpass
 #db.jndiName=DefaultDS
 
 #db.default.driver= com.mysql.jdbc.Driver
-#db.default.url=jdbc:mysql://127.0.0.1:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true
+#db.default.url=jdbc:mysql://TFB-database:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true
 #db.default.user=benchmarkdbuser
 #db.default.pass=benchmarkdbpass
 #db.default.jndiName=DefaultDS

frameworks/Java/play1/play1.dockerfile

@@ -0,0 +1,7 @@
+FROM tfb/java:latest
+ADD ./ /play1
+WORKDIR /play1
+RUN wget -nv https://downloads.typesafe.com/play/1.5.0/play-1.5.0.zip
+RUN unzip -q play-1.5.0.zip
+RUN apt-get install -y python
+CMD play-1.5.0/play run --%prod

frameworks/Java/play1/setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
-
-fw_depends mysql java play1 
-
-$PLAY1_HOME/play start --%prod

frameworks/Java/play2-java/benchmark_config.json

@@ -1,10 +1,8 @@
 {
-  "framework": "play2", 
+  "framework": "play2-java",
   "tests": [
     {
       "default": {
-        "display_name": "play2-java", 
-        "setup_file": "setup_java", 
         "framework": "play2", 
         "language": "Java", 
         "flavor": "None",
@@ -22,9 +20,7 @@
         "json_url": "/json", 
         "plaintext_url": "/plaintext"
       }, 
-      "java-netty": {
-        "display_name": "play2-java-netty", 
-        "setup_file": "setup_java_netty", 
+      "netty": {
         "framework": "play2", 
         "language": "Java", 
         "flavor": "None",
@@ -42,9 +38,7 @@
         "json_url": "/json", 
         "plaintext_url": "/plaintext"
       }, 
-      "java-ebean-hikaricp": {
-        "display_name": "play2-java-ebean-hikaricp", 
-        "setup_file": "setup_java_ebean_hikaricp", 
+      "ebean-hikaricp": {
         "framework": "play2", 
         "language": "Java", 
         "flavor": "None",
@@ -64,9 +58,7 @@
         "fortune_url": "/fortunes", 
         "update_url": "/update?queries="
       }, 
-      "java-ebean-hikaricp-netty": {
-        "display_name": "play2-java-ebean-hikaricp-netty", 
-        "setup_file": "setup_java_ebean_hikaricp_netty", 
+      "ebean-hikaricp-netty": {
         "framework": "play2", 
         "language": "Java", 
         "flavor": "None",
@@ -86,9 +78,7 @@
         "fortune_url": "/fortunes", 
         "update_url": "/update?queries="
       }, 
-      "java-jpa-hikaricp": {
-        "display_name": "play2-java-jpa-hikaricp", 
-        "setup_file": "setup_java_jpa_hikaricp", 
+      "jpa-hikaricp": {
         "framework": "play2", 
         "language": "Java", 
         "flavor": "None",
@@ -108,9 +98,7 @@
         "fortune_url": "/fortunes", 
         "update_url": "/update?queries="
       },
-      "java-jpa-hikaricp-netty": {
-        "display_name": "play2-java-jpa-hikaricp-netty", 
-        "setup_file": "setup_java_jpa_hikaricp_netty", 
+      "jpa-hikaricp-netty": {
         "framework": "play2", 
         "language": "Java", 
         "flavor": "None",
@@ -130,9 +118,7 @@
         "fortune_url": "/fortunes", 
         "update_url": "/update?queries="
       },
-      "java-jooq-hikaricp": {
-        "display_name": "play2-java-jooq-hikaricp", 
-        "setup_file": "setup_java_jooq_hikaricp", 
+      "jooq-hikaricp": {
         "framework": "play2", 
         "language": "Java", 
         "flavor": "None",
@@ -152,9 +138,7 @@
         "fortune_url": "/fortunes", 
         "update_url": "/update?queries="
       },
-      "java-jooq-hikaricp-netty": {
-        "display_name": "play2-java-jooq-hikaricp-netty", 
-        "setup_file": "setup_java_jooq_hikaricp_netty", 
+      "jooq-hikaricp-netty": {
         "framework": "play2", 
         "language": "Java", 
         "flavor": "None",

frameworks/Java/play2-java/play2-java-ebean-hikaricp-netty.dockerfile

@@ -0,0 +1,6 @@
+FROM tfb/sbt-java8:latest
+ADD ./play2-java-ebean-hikaricp /play2-java-ebean-hikaricp
+WORKDIR /play2-java-ebean-hikaricp
+RUN sbt stage
+CMD target/universal/stage/bin/play2-java-ebean-hikaricp \
+    -Dplay.server.provider=play.core.server.NettyServerProvider

frameworks/Java/play2-java/play2-java-ebean-hikaricp.dockerfile

@@ -0,0 +1,6 @@
+FROM tfb/sbt-java8:latest
+ADD ./play2-java-ebean-hikaricp /play2-java-ebean-hikaricp
+WORKDIR /play2-java-ebean-hikaricp
+RUN sbt stage
+CMD target/universal/stage/bin/play2-java-ebean-hikaricp \
+    -Dplay.server.provider=play.core.server.AkkaHttpServerProvider

frameworks/Java/play2-java/play2-java-jooq-hikaricp-netty.dockerfile

@@ -0,0 +1,6 @@
+FROM tfb/sbt-java8:latest
+ADD ./play2-java-jooq-hikaricp /play2-java-jooq-hikaricp
+WORKDIR /play2-java-jooq-hikaricp
+RUN sbt stage
+CMD target/universal/stage/bin/play2-java-jooq-hikaricp \
+    -Dplay.server.provider=play.core.server.NettyServerProvider

frameworks/Java/play2-java/play2-java-jooq-hikaricp.dockerfile

@@ -0,0 +1,6 @@
+FROM tfb/sbt-java8:latest
+ADD ./play2-java-jooq-hikaricp /play2-java-jooq-hikaricp
+WORKDIR /play2-java-jooq-hikaricp
+RUN sbt stage
+CMD target/universal/stage/bin/play2-java-jooq-hikaricp \
+    -Dplay.server.provider=play.core.server.AkkaHttpServerProvider

frameworks/Java/play2-java/play2-java-jpa-hikaricp-netty.dockerfile

@@ -0,0 +1,6 @@
+FROM tfb/sbt-java8:latest
+ADD ./play2-java-jpa-hikaricp /play2-java-jpa-hikaricp
+WORKDIR /play2-java-jpa-hikaricp
+RUN sbt stage
+CMD target/universal/stage/bin/play2-java-jpa-hikaricp \
+    -Dplay.server.provider=play.core.server.NettyServerProvider

frameworks/Java/play2-java/play2-java-jpa-hikaricp.dockerfile

@@ -0,0 +1,6 @@
+FROM tfb/sbt-java8:latest
+ADD ./play2-java-jpa-hikaricp /play2-java-jpa-hikaricp
+WORKDIR /play2-java-jpa-hikaricp
+RUN sbt stage
+CMD target/universal/stage/bin/play2-java-jpa-hikaricp \
+    -Dplay.server.provider=play.core.server.AkkaHttpServerProvider

frameworks/Java/play2-java/play2-java-netty.dockerfile

@@ -0,0 +1,6 @@
+FROM tfb/sbt-java8:latest
+ADD ./play2-java /play2-java
+WORKDIR /play2-java
+RUN sbt stage
+CMD target/universal/stage/bin/play2-java \
+    -Dplay.server.provider=play.core.server.NettyServerProvider

frameworks/Java/play2-java/play2-java.dockerfile

@@ -0,0 +1,6 @@
+FROM tfb/sbt-java8:latest
+ADD ./play2-java /play2-java
+WORKDIR /play2-java
+RUN sbt stage
+CMD target/universal/stage/bin/play2-java \
+    -Dplay.server.provider=play.core.server.AkkaHttpServerProvider

frameworks/Java/play2-java/setup_java.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-fw_depends java8 sbt
-
-cd play2-java
-
-rm -rf target/ project/target/ project/project/
-
-sbt stage
-target/universal/stage/bin/play2-java -Dplay.server.provider=play.core.server.AkkaHttpServerProvider &

frameworks/Java/play2-java/setup_java_ebean_hikaricp.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql java8 sbt
-
-cd play2-java-ebean-hikaricp
-
-rm -rf target/ project/target/ project/project/
-
-sbt stage
-target/universal/stage/bin/play2-java-ebean-hikaricp -Dplay.server.provider=play.core.server.AkkaHttpServerProvider &

frameworks/Java/play2-java/setup_java_ebean_hikaricp_netty.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql java8 sbt
-
-cd play2-java-ebean-hikaricp
-
-rm -rf target/ project/target/ project/project/
-
-sbt stage
-target/universal/stage/bin/play2-java-ebean-hikaricp -Dplay.server.provider=play.core.server.NettyServerProvider &

frameworks/Java/play2-java/setup_java_jooq_hikaricp.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql java8 sbt
-
-cd play2-java-jooq-hikaricp
-
-rm -rf target/ project/target/ project/project/
-
-sbt stage
-target/universal/stage/bin/play2-java-jooq-hikaricp -Dplay.server.provider=play.core.server.AkkaHttpServerProvider &

frameworks/Java/play2-java/setup_java_jooq_hikaricp_netty.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql java8 sbt
-
-cd play2-java-jooq-hikaricp
-
-rm -rf target/ project/target/ project/project/
-
-sbt stage
-target/universal/stage/bin/play2-java-jooq-hikaricp -Dplay.server.provider=play.core.server.NettyServerProvider &

frameworks/Java/play2-java/setup_java_jpa_hikaricp.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql java8 sbt
-
-cd play2-java-jpa-hikaricp
-
-rm -rf target/ project/target/ project/project/
-
-sbt stage
-target/universal/stage/bin/play2-java-jpa-hikaricp -Dplay.server.provider=play.core.server.AkkaHttpServerProvider &

frameworks/Java/play2-java/setup_java_jpa_hikaricp_netty.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql java8 sbt
-
-cd play2-java-jpa-hikaricp
-
-rm -rf target/ project/target/ project/project/
-
-sbt stage
-target/universal/stage/bin/play2-java-jpa-hikaricp -Dplay.server.provider=play.core.server.NettyServerProvider &

frameworks/Java/play2-java/setup_java_netty.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-fw_depends java8 sbt
-
-cd play2-java
-
-rm -rf target/ project/target/ project/project/
-
-sbt stage
-target/universal/stage/bin/play2-java -Dplay.server.provider=play.core.server.NettyServerProvider &

toolset/setup/linux/docker/systools/sbt-java8.dockerfile

@@ -1,4 +1,4 @@
 FROM tfb/java8:latest
 
-RUN wget https://dl.bintray.com/sbt/debian/sbt-1.1.1.deb
+RUN wget -nv https://dl.bintray.com/sbt/debian/sbt-1.1.1.deb
 RUN apt install -yqq ./sbt-1.1.1.deb

toolset/setup/linux/docker/systools/sbt.dockerfile

@@ -1,4 +1,4 @@
 FROM tfb/java:latest
 
-RUN wget https://dl.bintray.com/sbt/debian/sbt-1.1.1.deb
+RUN wget -nv https://dl.bintray.com/sbt/debian/sbt-1.1.1.deb
 RUN apt install -yqq ./sbt-1.1.1.deb