From bce530465e93954007329b3cbf6936f410b609c8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 2 Jan 2025 14:04:57 -0500 Subject: [PATCH 1/2] Update all non-major dependencies --- activemq/Dockerfile | 4 ++-- activemq/README.md | 2 +- blazegraph/Dockerfile | 4 ++-- fits/Dockerfile | 4 ++-- nginx/Dockerfile | 4 ++-- solr/Dockerfile | 8 ++++---- solr/README.md | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/activemq/Dockerfile b/activemq/Dockerfile index 75a39d16..3aa620ab 100644 --- a/activemq/Dockerfile +++ b/activemq/Dockerfile @@ -3,10 +3,10 @@ FROM java ARG TARGETARCH # renovate: datasource=github-tags depName=apache-activemq packageName=apache/activemq -ARG ACTIVEMQ_VERSION=5.18.5 +ARG ACTIVEMQ_VERSION=5.18.6 ARG ACTIVEMQ_FILE="apache-activemq-${ACTIVEMQ_VERSION}-bin.tar.gz" ARG ACTIVEMQ_URL="https://archive.apache.org/dist/activemq/${ACTIVEMQ_VERSION}/${ACTIVEMQ_FILE}" -ARG ACTIVEMQ_FILE_SHA256="1190b809a35ceb5fb0273f4a47d4584684d75c43360942be10d9af1fc0a39394" +ARG ACTIVEMQ_FILE_SHA256="b1363696e4e014423f6ab22f1ece4bf14ee32b80bfa5bdbae7dd4026a47ff03a" EXPOSE 61616 5672 61613 1883 61614 8161 diff --git a/activemq/README.md b/activemq/README.md index a9ae3b62..d9dac121 100644 --- a/activemq/README.md +++ b/activemq/README.md @@ -1,6 +1,6 @@ # ActiveMQ -Docker image for [ActiveMQ] version 5.18.5. +Docker image for [ActiveMQ] version 5.18.6. Please refer to the [ActiveMQ Documentation] for more in-depth information. diff --git a/blazegraph/Dockerfile b/blazegraph/Dockerfile index 2198a604..6b732912 100644 --- a/blazegraph/Dockerfile +++ b/blazegraph/Dockerfile @@ -8,10 +8,10 @@ ARG BLAZEGRAPH_URL="https://github.com/blazegraph/database/releases/download/BLA ARG BLAZEGRAPH_SHA256="b22f1a1aa8e536443db9a57da63720813374ef59e4021cfa9ad0e98f9a420e85" # renovate: datasource=github-releases depName=apache-log4j packageName=apache/logging-log4j2 -ARG LOG4J_VERSION=2.22.0 +ARG LOG4J_VERSION=2.24.3 ARG LOG4J_FILE="apache-log4j-${LOG4J_VERSION}-bin.zip" ARG LOG4J_URL="https://archive.apache.org/dist/logging/log4j/${LOG4J_VERSION}/${LOG4J_FILE}" -ARG LOG4J_FILE_SHA256="c6d61ecf2563b1200e02587b89b7c75b58b6e62e6a16cdb6f333c2482167c2dc" +ARG LOG4J_FILE_SHA256="359ef2d7278b67a72053239c1c8cdba44a5681097835d010982470e121c2338a" ARG OLD_LOG4J_VERSION="1.2.17" # Platform agnostic does not require arch specific identifier. diff --git a/fits/Dockerfile b/fits/Dockerfile index ebce7387..9f594378 100644 --- a/fits/Dockerfile +++ b/fits/Dockerfile @@ -16,10 +16,10 @@ ARG FITS_URL="https://github.com/harvard-lts/fits/releases/download/${FITS_VERSI ARG FITS_SHA256="32e436effe7251c5b067ec3f02321d5baf4944b3f0d1010fb8ec42039d9e3b73" # renovate: datasource=github-releases depName=apache-log4j packageName=apache/logging-log4j2 -ARG LOG4J_VERSION=2.23.1 +ARG LOG4J_VERSION=2.24.3 ARG LOG4J_FILE="apache-log4j-${LOG4J_VERSION}-bin.zip" ARG LOG4J_URL="https://archive.apache.org/dist/logging/log4j/${LOG4J_VERSION}/${LOG4J_FILE}" -ARG LOG4J_FILE_SHA256="c53645414ce68f21dd347439df5852ad16b38cd7227a9d417ebaf411a1c09501" +ARG LOG4J_FILE_SHA256="359ef2d7278b67a72053239c1c8cdba44a5681097835d010982470e121c2338a" ARG OLD_LOG4J_VERSION="2.22.0" # Platform agnostic does not require arch specific identifier. diff --git a/nginx/Dockerfile b/nginx/Dockerfile index be65ab71..ea94c047 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -3,10 +3,10 @@ FROM base ARG TARGETARCH # renovate: datasource=github-releases depName=custom-composer packageName=composer/composer -ARG COMPOSER_VERSION=2.8.2 +ARG COMPOSER_VERSION=2.8.4 ARG COMPOSER_FILE=composer.phar ARG COMPOSER_URL=https://getcomposer.org/download/${COMPOSER_VERSION}/${COMPOSER_FILE} -ARG COMPOSER_SHA256=9ed076041e269820c6c4223d66c5325fcaddc7f4b4317b3ba936812a965857ed +ARG COMPOSER_SHA256="c4c4e2e1beab0ea04e0bd042a5dbba9feda1fbf5eda0d36203958edd343c0a8a" WORKDIR /var/www diff --git a/solr/Dockerfile b/solr/Dockerfile index 8e32653e..f64fbe20 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -3,15 +3,15 @@ FROM java ARG TARGETARCH # renovate: datasource=github-tags depName=apache-solr packageName=apache/solr -ARG SOLR_VERSION=9.5.0 +ARG SOLR_VERSION=9.7.0 ARG SOLR_FILE=solr-${SOLR_VERSION}.tgz ARG SOLR_URL=https://archive.apache.org/dist/solr/solr/${SOLR_VERSION}/solr-${SOLR_VERSION}.tgz -ARG SOLR_FILE_SHA256=d8538502019af1945e0b124a4613b46ca43aedcf3f20e9912c482c080407ea21 +ARG SOLR_FILE_SHA256="38548b86fa4e3c87883875952da124bf7d742cb8f7b25d37a1176833588e8552" # renovate: datasource=github-releases depName=solr-ocrhighlighting packageName=dbmdz/solr-ocrhighlighting -ARG OCRHIGHLIGHT_VERSION=0.9.0 +ARG OCRHIGHLIGHT_VERSION=0.9.1 ARG OCRHIGHLIGHT_FILE=solr-ocrhighlighting-${OCRHIGHLIGHT_VERSION}.jar ARG OCRHIGHLIGHT_URL=https://github.com/dbmdz/solr-ocrhighlighting/releases/download/${OCRHIGHLIGHT_VERSION}/solr-ocrhighlighting-${OCRHIGHLIGHT_VERSION}.jar -ARG OCRHIGHLIGHT_FILE_SHA256=79eb7374989359c74903daefbe61f7feb9aeb7367ee6f7e1361fe8b911d2fa82 +ARG OCRHIGHLIGHT_FILE_SHA256="e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" ARG OCRHIGHLIGHT_DEST=/opt/solr/server/solr/contrib/ocrhighlighting/lib EXPOSE 8983 diff --git a/solr/README.md b/solr/README.md index 06084c94..584fb05e 100644 --- a/solr/README.md +++ b/solr/README.md @@ -1,6 +1,6 @@ # Solr -Docker image for [solr] version 9.5.0. +Docker image for [solr] version 9.7.0. Please refer to the [Solr Documentation] for more in-depth information. From 79b8c3569063d17af1690bdce59a6a38acc79645 Mon Sep 17 00:00:00 2001 From: Joe Corall Date: Thu, 2 Jan 2025 14:16:32 -0500 Subject: [PATCH 2/2] Need to follow redirects for github assets --- ci/update-sha.sh | 2 +- solr/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/update-sha.sh b/ci/update-sha.sh index c4d0aa8d..d3a93012 100755 --- a/ci/update-sha.sh +++ b/ci/update-sha.sh @@ -97,7 +97,7 @@ else fi # update the Dockerfile(s) SHA256 with the file we're downloading -SHA=$(curl -s "$URL" \ +SHA=$(curl -Ls "$URL" \ | shasum -a 256 \ | awk '{print $1}') if [[ "$OSTYPE" == "darwin"* ]]; then diff --git a/solr/Dockerfile b/solr/Dockerfile index f64fbe20..c054c30e 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -11,7 +11,7 @@ ARG SOLR_FILE_SHA256="38548b86fa4e3c87883875952da124bf7d742cb8f7b25d37a117683358 ARG OCRHIGHLIGHT_VERSION=0.9.1 ARG OCRHIGHLIGHT_FILE=solr-ocrhighlighting-${OCRHIGHLIGHT_VERSION}.jar ARG OCRHIGHLIGHT_URL=https://github.com/dbmdz/solr-ocrhighlighting/releases/download/${OCRHIGHLIGHT_VERSION}/solr-ocrhighlighting-${OCRHIGHLIGHT_VERSION}.jar -ARG OCRHIGHLIGHT_FILE_SHA256="e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" +ARG OCRHIGHLIGHT_FILE_SHA256="91be01fe52553ea774b9a6804b149ab2fc9b8937eb19d91455b0b17c865c2971" ARG OCRHIGHLIGHT_DEST=/opt/solr/server/solr/contrib/ocrhighlighting/lib EXPOSE 8983