Skip to content
Snippets Groups Projects
Commit d989c468 authored by Vincent Massol's avatar Vincent Massol
Browse files

XDOCKER-233: Use a Java JRE and not a JDK

parent 8d19db31
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
13/mariadb-tomcat/Dockerfile
+ 1
− 1
View file @ d989c468
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
FROM tomcat:9-jdk11 FROM tomcat:9-jre11
# ____ ____ ____ ____ _ __ _ # ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_) # |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
......
13/mysql-tomcat/Dockerfile
+ 3
− 3
View file @ d989c468
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
FROM tomcat:9-jdk11 FROM tomcat:9-jre11
# ____ ____ ____ ____ _ __ _ # ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_) # |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
...@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \ ...@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
# Copy the JDBC driver in the XWiki webapp # Copy the JDBC driver in the XWiki webapp
# For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to
# date Debian repository for it anymore. # date Debian repository for it anymore.
ENV MYSQL_JDBC_VERSION="8.0.28" ENV MYSQL_JDBC_VERSION="8.0.29"
ENV MYSQL_JDBC_SHA256="a00ccdf537ff50e50067b989108c2235197ffb65e197149bbb669db843cd1c3e" ENV MYSQL_JDBC_SHA256="d4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6"
ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}" ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}"
ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar" ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar"
ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}" ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"
......
13/postgres-tomcat/Dockerfile
+ 1
− 1
View file @ d989c468
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
FROM tomcat:9-jdk11 FROM tomcat:9-jre11
# ____ ____ ____ ____ _ __ _ # ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_) # |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
......
14/mariadb-tomcat/Dockerfile
+ 1
− 1
View file @ d989c468
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
FROM tomcat:9-jdk11 FROM tomcat:9-jre11
# ____ ____ ____ ____ _ __ _ # ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_) # |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
......
14/mysql-tomcat/Dockerfile
+ 3
− 3
View file @ d989c468
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
FROM tomcat:9-jdk11 FROM tomcat:9-jre11
# ____ ____ ____ ____ _ __ _ # ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_) # |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
...@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \ ...@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
# Copy the JDBC driver in the XWiki webapp # Copy the JDBC driver in the XWiki webapp
# For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to
# date Debian repository for it anymore. # date Debian repository for it anymore.
ENV MYSQL_JDBC_VERSION="8.0.28" ENV MYSQL_JDBC_VERSION="8.0.29"
ENV MYSQL_JDBC_SHA256="a00ccdf537ff50e50067b989108c2235197ffb65e197149bbb669db843cd1c3e" ENV MYSQL_JDBC_SHA256="d4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6"
ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}" ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}"
ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar" ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar"
ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}" ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"
......
14/postgres-tomcat/Dockerfile
+ 1
− 1
View file @ d989c468
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
FROM tomcat:9-jdk11 FROM tomcat:9-jre11
# ____ ____ ____ ____ _ __ _ # ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_) # |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
......
template/Dockerfile
+ 1
− 1
View file @ d989c468
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
FROM tomcat:9-jdk11 FROM tomcat:9-jre11
# ____ ____ ____ ____ _ __ _ # ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_) # |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Consent

On this website, we use the web analytics service Matomo to analyze and review the use of our website. Through the collected statistics, we can improve our offerings and make them more appealing for you. Here, you can decide whether to allow us to process your data and set corresponding cookies for these purposes, in addition to technically necessary cookies. Further information on data protection—especially regarding "cookies" and "Matomo"—can be found in our privacy policy. You can withdraw your consent at any time.