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

[Misc] Force the docker image releaser to update the JDBC driver versions (so...

[Misc] Force the docker image releaser to update the JDBC driver versions (so that they're up to date)
parent a58dee92
No related branches found
No related tags found
No related merge requests found
...@@ -29,18 +29,34 @@ defaultTasks 'generate' ...@@ -29,18 +29,34 @@ defaultTasks 'generate'
def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat'] def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat']
// Note: To compute the sha256, download the XWiki WAR and issue: // Notes:
// - Unix: sha256sum <binary name> // - To compute the XWiki sha256, download the XWiki WAR and issue:
// - Mac: shasum --algorithm 256 <binary name> // - Unix: sha256sum <binary name>
// - Mac: shasum --algorithm 256 <binary name>
// - To compute the mysql JDBC sha256, get the JAR at https://search.maven.org/artifact/mysql/mysql-connector-java and
// do the same as for the XWiki sha256.
// - To compute the mysql JDBC sha256, get the JAR at
// https://search.maven.org/artifact/org.mariadb.jdbc/mariadb-java-client and do the same as for the XWiki sha256.
// - Use the JDBC driver versions found in the XWiki POM for the specified versions:
// - mysql: https://github.com/xwiki/xwiki-platform/blob/master/pom.xml#L97 (link for master)
// - mariadb: https://github.com/xwiki/xwiki-platform/blob/master/pom.xml#L100 (link for master)
def tokens = [ def tokens = [
'14': [ '14': [
xwikiVersion: '14.1', xwikiVersion: '14.1',
xwikiSha256: '71d739098e9edc2f343c7a7c15034cf0651ad8e97f1cb59ae0c979181fc677a3' xwikiSha256: '71d739098e9edc2f343c7a7c15034cf0651ad8e97f1cb59ae0c979181fc677a3',
mysqlJDBCVersion: '8.0.28',
mysqlJDBCSha256: 'a00ccdf537ff50e50067b989108c2235197ffb65e197149bbb669db843cd1c3e',
mariadbJDBCVersion: '3.0.3',
mariadbJDBCSha256: '613086a0a20f177dfcf5e227f519272bc6be88bde4011de0f23c533231a7ae05'
], ],
'13': [ '13': [
xwikiVersion: '13.10.3', xwikiVersion: '13.10.3',
xwikiSha256: 'f4f13dcab88baffb0e62fccc5d6375a6d023e4ac7414c502375dd1e8d503cbbd' xwikiSha256: 'f4f13dcab88baffb0e62fccc5d6375a6d023e4ac7414c502375dd1e8d503cbbd',
mysqlJDBCVersion: '8.0.28',
mysqlJDBCSha256: 'a00ccdf537ff50e50067b989108c2235197ffb65e197149bbb669db843cd1c3e',
mariadbJDBCVersion: '3.0.3',
mariadbJDBCSha256: '613086a0a20f177dfcf5e227f519272bc6be88bde4011de0f23c533231a7ae05'
] ]
] ]
......
...@@ -63,10 +63,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \\ ...@@ -63,10 +63,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \\
<% if (db == 'mysql') { <% if (db == 'mysql') {
println "# For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to " println "# For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to "
println "# date Debian repository for it anymore." println "# date Debian repository for it anymore."
println "ENV MYSQL_JDBC_VERSION=\"8.0.28\"" println "ENV MYSQL_JDBC_VERSION=\"$mysqlJDBCVersion\""
// Get the SHA256 from the JAR at https://search.maven.org/artifact/mysql/mysql-connector-java and using the println "ENV MYSQL_JDBC_SHA256=\"$mysqlJDBCSha256\""
// command line defined in build.gradle.
println "ENV MYSQL_JDBC_SHA256=\"a00ccdf537ff50e50067b989108c2235197ffb65e197149bbb669db843cd1c3e\""
println "ENV MYSQL_JDBC_PREFIX=\"https://repo1.maven.org/maven2/mysql/mysql-connector-java/\${MYSQL_JDBC_VERSION}\"" println "ENV MYSQL_JDBC_PREFIX=\"https://repo1.maven.org/maven2/mysql/mysql-connector-java/\${MYSQL_JDBC_VERSION}\""
println "ENV MYSQL_JDBC_ARTIFACT=\"mysql-connector-java-\${MYSQL_JDBC_VERSION}.jar\"" println "ENV MYSQL_JDBC_ARTIFACT=\"mysql-connector-java-\${MYSQL_JDBC_VERSION}.jar\""
println "ENV MYSQL_JDBC_TARGET=\"/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/\${MYSQL_JDBC_ARTIFACT}\"" println "ENV MYSQL_JDBC_TARGET=\"/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/\${MYSQL_JDBC_ARTIFACT}\""
...@@ -75,10 +73,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \\ ...@@ -75,10 +73,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \\
} else if (db == 'mariadb') { } else if (db == 'mariadb') {
println "# For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version " println "# For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version "
println "# used." println "# used."
println "ENV MARIADB_JDBC_VERSION=\"3.0.3\"" println "ENV MARIADB_JDBC_VERSION=\"$mariadbJDBCVersion\""
// Get the SHA256 from the JAR at https://search.maven.org/artifact/org.mariadb.jdbc/mariadb-java-client and using the println "ENV MARIADB_JDBC_SHA256=\"$mariadbJDBCSha256\""
// command line defined in build.gradle.
println "ENV MARIADB_JDBC_SHA256=\"613086a0a20f177dfcf5e227f519272bc6be88bde4011de0f23c533231a7ae05\""
println "ENV MARIADB_JDBC_PREFIX=\"https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/\${MARIADB_JDBC_VERSION}\"" println "ENV MARIADB_JDBC_PREFIX=\"https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/\${MARIADB_JDBC_VERSION}\""
println "ENV MARIADB_JDBC_ARTIFACT=\"mariadb-java-client-\${MARIADB_JDBC_VERSION}.jar\"" println "ENV MARIADB_JDBC_ARTIFACT=\"mariadb-java-client-\${MARIADB_JDBC_VERSION}.jar\""
println "ENV MARIADB_JDBC_TARGET=\"/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/\${MARIADB_JDBC_ARTIFACT}\"" println "ENV MARIADB_JDBC_TARGET=\"/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/\${MARIADB_JDBC_ARTIFACT}\""
......
0% Loading 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.