From aaef88247fa1d160b8233f2ae6073427c8fea54f Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@jessfraz.com>
Date: Fri, 26 Jul 2019 09:24:17 -0700
Subject: [PATCH] change gitiles bazel version

Signed-off-by: Jess Frazelle <acidburn@jessfraz.com>
---
 gitiles/Dockerfile | 23 +++++++++++------------
 gitiles/start.sh   |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/gitiles/Dockerfile b/gitiles/Dockerfile
index 8e9bc7c..a7b326d 100644
--- a/gitiles/Dockerfile
+++ b/gitiles/Dockerfile
@@ -5,13 +5,13 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 
 RUN apk add --no-cache \
 	bash \
-	ca-certificates \
-	openjdk8
+	ca-certificates
 
 # https://github.com/bazelbuild/bazel/releases
-ENV BAZEL_VERSION 0.12.0
+ENV BAZEL_VERSION 0.28.1
 # https://gerrit.googlesource.com/gitiles/
-ENV GITILES_VERSION v0.2-1
+ENV GITILES_VERSION v0.3-1
+ENV JAVA_HOME /usr/lib/jvm/default-jvm
 
 # install bazel
 RUN set -x \
@@ -20,8 +20,10 @@ RUN set -x \
 		curl \
 		git \
 		linux-headers \
-		python \
+		openjdk11 \
+		python3 \
 		zip \
+	&& ln -snf $(which python3) /usr/bin/python \
 	&& : install Bazel to build gitiles \
     && curl -sSL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-dist.zip" -o /tmp/bazel.zip \
     && mkdir "/tmp/bazel-${BAZEL_VERSION}" \
@@ -29,17 +31,14 @@ RUN set -x \
 	&& rm -rf /tmp/bazel.zip \
 	&& ( \
     	cd "/tmp/bazel-${BAZEL_VERSION}" \
-    	&& : add -fpermissive compiler option to avoid compilation failure \
-    	&& sed -i -e '/"-std=c++0x"/{h;s//"-fpermissive"/;x;G}' tools/cpp/cc_configure.bzl \
-    	&& : add '#include <sys/stat.h>' to avoid mode_t type error \
-    	&& sed -i -e '/#endif  \/\/ COMPILER_MSVC/{h;s//#else/;G;s//#include <sys\/stat.h>/;G;}' third_party/ijar/common.h \
     	&& bash compile.sh \
     	&& cp -p output/bazel /usr/bin/ \
-	) \
-	&& git clone --depth 1 --branch "${GITILES_VERSION}" https://gerrit.googlesource.com/gitiles /usr/src/gitiles \
+	)
+
+RUN git clone --depth 1 --branch "${GITILES_VERSION}" https://gerrit.googlesource.com/gitiles /usr/src/gitiles \
 	&& ( \
 		cd /usr/src/gitiles \
-		&& bazel build --incompatible_disallow_uncalled_set_constructor=false gitiles-dev:dev \
+		&& bazel build --incompatible_depset_is_not_iterable=false --sandbox_debug //:gitiles \
 		&& cp -rL bazel-bin bin \
 		&& rm -rf bazel-bin \
 	) \
diff --git a/gitiles/start.sh b/gitiles/start.sh
index 585877a..ccdc6d5 100755
--- a/gitiles/start.sh
+++ b/gitiles/start.sh
@@ -28,4 +28,4 @@ fi
 PROPERTIES="$PROPERTIES --jvm_flag=-Dcom.google.gitiles.sourcePath=$ROOT"
 
 # shellcheck disable=SC2086
-exec "${ROOT}/bin/gitiles-dev/dev" $PROPERTIES
+exec "${ROOT}/bin/java/com/google/gitiles/dev/dev" $PROPERTIES