From 5df8226ffad1c8edec05e6d40926241efae1819a Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@jessfraz.com>
Date: Mon, 16 Sep 2019 18:18:07 -0700
Subject: [PATCH] update gitiles

Signed-off-by: Jess Frazelle <acidburn@jessfraz.com>
---
 gitiles/Dockerfile | 52 ++++++++++++++++++----------------------------
 gitiles/start.sh   |  2 +-
 latest-versions.sh |  1 -
 3 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/gitiles/Dockerfile b/gitiles/Dockerfile
index 8e9bc7c..0579fa4 100644
--- a/gitiles/Dockerfile
+++ b/gitiles/Dockerfile
@@ -1,51 +1,39 @@
-FROM alpine:latest
+FROM ubuntu:bionic
 LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+# https://gerrit.googlesource.com/gitiles/
+ENV GITILES_VERSION v0.3
 
-RUN apk add --no-cache \
+RUN apt-get update && apt-get install -y \
+	apt-transport-https \
 	bash \
 	ca-certificates \
-	openjdk8
-
-# https://github.com/bazelbuild/bazel/releases
-ENV BAZEL_VERSION 0.12.0
-# https://gerrit.googlesource.com/gitiles/
-ENV GITILES_VERSION v0.2-1
+	curl \
+	git \
+	gnupg \
+	openjdk-8-jdk \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
 
 # install bazel
 RUN set -x \
-	&& apk add --no-cache --virtual=.build-deps \
-		build-base \
-		curl \
-		git \
-		linux-headers \
-		python \
-		zip \
+	&& echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \
+	&& curl https://bazel.build/bazel-release.pub.gpg | apt-key add - \
+	&& apt-get update && apt-get install -y \
+	bazel \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/* \
 	&& : 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}" \
-    && unzip -qd "/tmp/bazel-${BAZEL_VERSION}" /tmp/bazel.zip \
-	&& 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 \
 	&& ( \
 		cd /usr/src/gitiles \
-		&& bazel build --incompatible_disallow_uncalled_set_constructor=false gitiles-dev:dev \
+		&& bazel build java/com/google/gitiles/dev \
 		&& cp -rL bazel-bin bin \
 		&& rm -rf bazel-bin \
 	) \
 	&& : clean up unneeded packages and files \
-    && apk del .build-deps \
-	&& rm -rf /usr/bin/bazel /tmp/* /root/.cache "/tmp/bazel-${BAZEL_VERSION}"
+    && apt purge -y --auto-remove bazel \
+	&& rm /etc/apt/sources.list.d/bazel.list
 
 COPY start.sh /usr/bin/start.sh
 
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
diff --git a/latest-versions.sh b/latest-versions.sh
index cd37b20..e194956 100755
--- a/latest-versions.sh
+++ b/latest-versions.sh
@@ -114,7 +114,6 @@ curl/curl
 kolide/fleet
 GoogleCloudPlatform/cloud-sdk-docker
 google/gitiles
-bazelbuild/bazel
 google/guetzli
 irssi/irssi
 cryptodotis/irssi-otr