diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile index 46b8dd8d0f3436729cc817d28cf5c7009f072b75..8abf454cd8b67e9423e900f55d9cc554c4823a6e 100644 --- a/11/mysql-tomcat/Dockerfile +++ b/11/mysql-tomcat/Dockerfile @@ -58,10 +58,12 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \ # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to # date Debian repository for it anymore. ENV MYSQL_JDBC_VERSION="8.0.20" +ENV MYSQL_JDBC_SHA256="56a42553b516660ae0bcd08f7f4f5f375294afbd62200d6c0c88a8c61c668ede" 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_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 +RUN curl -fSL "${MYSQL_JDBC_PREFIX}/${MYSQL_JDBC_ARTIFACT}" -o $MYSQL_JDBC_TARGET && \ + echo "$MYSQL_JDBC_SHA256 $MYSQL_JDBC_TARGET" | sha256sum -c - # Configure Tomcat. For example set the memory for the Tomcat JVM since the default value is too small for XWiki COPY tomcat/setenv.sh /usr/local/tomcat/bin/ diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile index 73747862c4401cb1cf29f0db255a5f7804916b25..bf0b1484199c792818fb80ccb8562a2e7fbf7bcf 100644 --- a/12/mysql-tomcat/Dockerfile +++ b/12/mysql-tomcat/Dockerfile @@ -58,10 +58,12 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \ # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to # date Debian repository for it anymore. ENV MYSQL_JDBC_VERSION="8.0.20" +ENV MYSQL_JDBC_SHA256="56a42553b516660ae0bcd08f7f4f5f375294afbd62200d6c0c88a8c61c668ede" 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_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 +RUN curl -fSL "${MYSQL_JDBC_PREFIX}/${MYSQL_JDBC_ARTIFACT}" -o $MYSQL_JDBC_TARGET && \ + echo "$MYSQL_JDBC_SHA256 $MYSQL_JDBC_TARGET" | sha256sum -c - # Configure Tomcat. For example set the memory for the Tomcat JVM since the default value is too small for XWiki COPY tomcat/setenv.sh /usr/local/tomcat/bin/ diff --git a/template/Dockerfile b/template/Dockerfile index 48808c8a1e8310e0986ff896439f5e67c1d36eca..173da68b9354c46968833fd99eeb8422178229e7 100644 --- a/template/Dockerfile +++ b/template/Dockerfile @@ -63,10 +63,12 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \\ 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 "ENV MYSQL_JDBC_VERSION=\"8.0.20\"" + println "ENV MYSQL_JDBC_SHA256=\"56a42553b516660ae0bcd08f7f4f5f375294afbd62200d6c0c88a8c61c668ede\"" 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_TARGET=\"/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/\${MYSQL_JDBC_ARTIFACT}\"" - print "RUN curl -fSL \"\${MYSQL_JDBC_PREFIX}/\${MYSQL_JDBC_ARTIFACT}\" -o \$MYSQL_JDBC_TARGET" + println "RUN curl -fSL \"\${MYSQL_JDBC_PREFIX}/\${MYSQL_JDBC_ARTIFACT}\" -o \$MYSQL_JDBC_TARGET && \\" + print " echo \"\$MYSQL_JDBC_SHA256 \$MYSQL_JDBC_TARGET\" | sha256sum -c -" } else if (db == 'postgres') { print 'RUN cp /usr/share/java/postgresql-jdbc4.jar /usr/local/tomcat/webapps/ROOT/WEB-INF/lib/' } %>