Upgrade to Ubuntu 16.04 for Gerrit 2.14
Change-Id: I1e4e75360c000b5b198e3ad423717a26cf1d30de
diff --git a/docker/ubuntu15.04/Makefile b/docker/ubuntu16.04/Makefile
similarity index 89%
rename from docker/ubuntu15.04/Makefile
rename to docker/ubuntu16.04/Makefile
index bd4fe85..dacb4e8 100644
--- a/docker/ubuntu15.04/Makefile
+++ b/docker/ubuntu16.04/Makefile
@@ -5,14 +5,14 @@
RELEASE=1
VENDOR=GerritForge
VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
-IMAGE=$(VENDOR_LC)/gerrit-ubuntu15.04
+IMAGE=$(VENDOR_LC)/gerrit-ubuntu16.04
PGP_KEY_ID=1871F775
NO_CACHE=true
# End of the variables that can be customized
define DOCKERFILE
-FROM ubuntu:15.04
+FROM ubuntu:16.04
MAINTAINER $(VENDOR)
# Add Gerrit packages repository
@@ -27,11 +27,10 @@
# Install OpenJDK and Gerrit in two subsequent transactions
# (pre-trans Gerrit script needs to have access to the Java command)
RUN apt-get -y install openjdk-8-jdk
-RUN apt-get -y install gerrit=$(VERSION)-$(RELEASE)
+RUN apt-get -y install gerrit=$(VERSION)-$(RELEASE) && rm -f /var/gerrit/logs/*
USER gerrit
RUN java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
-RUN java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
# Allow incoming traffic
EXPOSE 29418 8080
