Upgrade CentOS to 8.1.1911 and OpenJDK 11
Gerrit v3.2.0 brings the official support for Java 11,
therefore a major upgrade of the CentOS distribution and
Java is fully justified.
Upgrade the following components:
- Gerrit: v3.2.0-rc0
- CentOS: v8.1.1911
- OpenJDK: v11
Change-Id: Icf1969d03e469d7ff24d263e620350578b477401
diff --git a/centos/7/.dockerignore b/centos/8/.dockerignore
similarity index 100%
rename from centos/7/.dockerignore
rename to centos/8/.dockerignore
diff --git a/centos/7/Dockerfile b/centos/8/Dockerfile
similarity index 88%
rename from centos/7/Dockerfile
rename to centos/8/Dockerfile
index d5a4176..0f0b5c1 100644
--- a/centos/7/Dockerfile
+++ b/centos/8/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7.7.1908
+FROM centos:8.1.1911
MAINTAINER Gerrit Code Review Community
# Add Gerrit packages repository
@@ -9,8 +9,8 @@
# Install OS pre-prequisites, OpenJDK and Gerrit in two subsequent transactions
# (pre-trans Gerrit script needs to have access to the Java command)
RUN yum -y install initscripts && \
- yum -y install java-1.8.0-openjdk && \
- yum -y install gerrit-3.1.4-1 && \
+ yum -y install java-11-openjdk && \
+ yum -y install gerrit-3.2.0.rc0-1 && \
/entrypoint.sh init && \
rm -f /var/gerrit/etc/{ssh,secure}* && rm -Rf /var/gerrit/{static,index,logs,data,index,cache,git,db,tmp}/* && chown -R gerrit:gerrit /var/gerrit && \
yum -y clean all
diff --git a/centos/7/Dockerfile-dev b/centos/8/Dockerfile-dev
similarity index 95%
rename from centos/7/Dockerfile-dev
rename to centos/8/Dockerfile-dev
index dfba96d..09ba812 100644
--- a/centos/7/Dockerfile-dev
+++ b/centos/8/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM centos:7.6.1810
+FROM centos:8.1.1911
MAINTAINER Gerrit Code Review Community
ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war"
@@ -9,7 +9,7 @@
openssh-client \
initscripts \
sudo \
- java-1.8.0-openjdk \
+ java-11-openjdk && \
git && \
yum -y clean all
diff --git a/centos/7/entrypoint.sh b/centos/8/entrypoint.sh
similarity index 100%
rename from centos/7/entrypoint.sh
rename to centos/8/entrypoint.sh
