From 2afb800f554f08f7ada9b1ab09f9140fca737177 Mon Sep 17 00:00:00 2001 From: Simon Urli <simon.urli@xwiki.com> Date: Fri, 25 Nov 2022 10:13:36 +0100 Subject: [PATCH] XWIKI-20253: Upgrade to MySQL connector 8.0.31 * Fix URL for downloading the connector --- 13/mysql-tomcat/Dockerfile | 2 +- 14.4/mysql-tomcat/Dockerfile | 2 +- 14/mysql-tomcat/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile index 07a0bca..5d76768 100644 --- a/13/mysql-tomcat/Dockerfile +++ b/13/mysql-tomcat/Dockerfile @@ -64,7 +64,7 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \ # date Debian repository for it anymore. ENV MYSQL_JDBC_VERSION="8.0.31" ENV MYSQL_JDBC_SHA256="5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f" -ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com.mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}" +ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}" ENV MYSQL_JDBC_ARTIFACT="mysql-connector-j-${MYSQL_JDBC_VERSION}.jar" ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}" RUN curl -fSL "${MYSQL_JDBC_PREFIX}/${MYSQL_JDBC_ARTIFACT}" -o $MYSQL_JDBC_TARGET && \ diff --git a/14.4/mysql-tomcat/Dockerfile b/14.4/mysql-tomcat/Dockerfile index 45f696b..a82d382 100644 --- a/14.4/mysql-tomcat/Dockerfile +++ b/14.4/mysql-tomcat/Dockerfile @@ -64,7 +64,7 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \ # date Debian repository for it anymore. ENV MYSQL_JDBC_VERSION="8.0.31" ENV MYSQL_JDBC_SHA256="5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f" -ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com.mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}" +ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}" ENV MYSQL_JDBC_ARTIFACT="mysql-connector-j-${MYSQL_JDBC_VERSION}.jar" ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}" RUN curl -fSL "${MYSQL_JDBC_PREFIX}/${MYSQL_JDBC_ARTIFACT}" -o $MYSQL_JDBC_TARGET && \ diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile index e941441..7212507 100644 --- a/14/mysql-tomcat/Dockerfile +++ b/14/mysql-tomcat/Dockerfile @@ -64,7 +64,7 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \ # date Debian repository for it anymore. ENV MYSQL_JDBC_VERSION="8.0.31" ENV MYSQL_JDBC_SHA256="5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f" -ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com.mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}" +ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}" ENV MYSQL_JDBC_ARTIFACT="mysql-connector-j-${MYSQL_JDBC_VERSION}.jar" ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}" RUN curl -fSL "${MYSQL_JDBC_PREFIX}/${MYSQL_JDBC_ARTIFACT}" -o $MYSQL_JDBC_TARGET && \ -- GitLab