From 80981a52c8cd150792adc84011360a7ee7d74b60 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 25 Aug 2019 11:29:12 +0200 Subject: [PATCH] Update bazel flags to be more inline with upstream During the Gerrit Hackathon, we learned some things about setting bazel options. Use the ones recommended in upstream docs rather than these. The outcome should be largely the same. Change-Id: I32b4c567488f0739fb80f69dc881b9837803575c --- docker/gerrit/bazel/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/gerrit/bazel/Dockerfile b/docker/gerrit/bazel/Dockerfile index e059a9bd2a..0518d02dff 100644 --- a/docker/gerrit/bazel/Dockerfile +++ b/docker/gerrit/bazel/Dockerfile @@ -42,10 +42,11 @@ RUN cd /usr/src \ --local_cpu_resources=1 \ --host_force_python=PY3 \ --incompatible_string_join_requires_strings=false \ - --host_javabase=@local_jdk//:jdk \ - --javabase=@local_jdk//:jdk \ - --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 \ - --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 \ + --define=ABSOLUTE_JAVABASE=/usr/lib/jvm/java-8-openjdk-amd64 \ + --javabase=@bazel_tools//tools/jdk:absolute_javabase \ + --host_javabase=@bazel_tools//tools/jdk:absolute_javabase \ + --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla \ + --java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla \ ${BAZEL_OPTS} FROM openjdk:8