Merge pull request #160 from mattmoor/jvm-flags

Make java_image respect jvm_flags

Author: mattmoor

docker/build_test.sh

@@ -783,6 +783,12 @@ function test_cc_image() {
 /app/docker/testdata/cc_image.binary'
 }
 
+function join_by() {
+    local IFS="$1"
+    shift
+    echo "$*"
+}
+
 function test_java_image() {
   # Don't check the full layer set because the base will vary,
   # but check the files in our top two layers.
@@ -813,6 +819,16 @@ function test_java_image() {
 ./app/io_bazel_rules_docker/docker/testdata/java_image.binary
 ./app/io_bazel_rules_docker/docker/testdata/java_image.binary.jar
 ./app/io_bazel_rules_docker/docker/testdata/java_image.classpath'
+
+  class_path=$(join_by : \
+      "/app/io_bazel_rules_docker/docker/testdata/libjava_image_library.jar" \
+      "/app/io_bazel_rules_docker/../com_google_guava_guava/jar/guava-18.0.jar" \
+      "/app/io_bazel_rules_docker/docker/testdata/java_image.binary.jar" \
+      "/app/io_bazel_rules_docker/docker/testdata/java_image.binary")
+
+  check_entrypoint "java_image" \
+      "${bin_layer}" \
+      "[\"/usr/bin/java\", \"-cp\", \"${class_path}\", \"-XX:MaxPermSize=128M\", \"examples.images.Binary\"]"
 }
 
 function test_war_image() {

docker/contrib/java/image.bzl

@@ -117,8 +117,7 @@ def _jar_app_layer_impl(ctx):
       '-cp',
       # Support optionally passing the classpath as a file.
       '@' + classpath_path if ctx.attr._classpath_as_file else classpath,
-      ctx.attr.main_class
-   ]
+   ] + ctx.attr.jvm_flags + [ctx.attr.main_class]
 
   file_map = {
     layer_file_path(ctx, f): f
@@ -141,6 +140,7 @@ _jar_app_layer = rule(
         # The rest of the dependencies.
         "deps": attr.label_list(),
         "runtime_deps": attr.label_list(),
+        "jvm_flags": attr.string_list(),
         # The base image on which to overlay the dependency layers.
         "base": attr.label(mandatory = True),
         # The main class to invoke on startup.
@@ -161,7 +161,8 @@ _jar_app_layer = rule(
 )
 
 def java_image(name, base=None, main_class=None,
-               deps=[], runtime_deps=[], layers=[], **kwargs):
+               deps=[], runtime_deps=[], layers=[], jvm_flags=[],
+               **kwargs):
   """Builds a Docker image overlaying the java_binary.
 
   Args:
@@ -177,7 +178,7 @@ def java_image(name, base=None, main_class=None,
                      # not allowed to pass deps (even []) if there is no srcs
                      # kwarg.
                      deps=(deps + layers) or None, runtime_deps=runtime_deps,
-                     **kwargs)
+                     jvm_flags=jvm_flags, **kwargs)
 
   index = 0
   base = base or "@java_image_base//image"
@@ -188,7 +189,7 @@ def java_image(name, base=None, main_class=None,
     index += 1
 
   _jar_app_layer(name=name, base=base, binary=binary_name,
-                 main_class=main_class,
+                 main_class=main_class, jvm_flags=jvm_flags,
                  deps=deps, runtime_deps=runtime_deps, layers=layers)
 
 def _war_dep_layer_impl(ctx):

docker/testdata/BUILD

@@ -489,6 +489,7 @@ java_library(
 java_image(
     name = "java_image",
     srcs = ["Binary.java"],
+    jvm_flags = ["-XX:MaxPermSize=128M"],
     layers = [":java_image_library"],
     main_class = "examples.images.Binary",
 )