Skip to content

Commit 1996980

Browse files
committed
[skip-release] have renovate check downloads.apache for updates
1 parent d094489 commit 1996980

File tree

8 files changed

+19
-15
lines changed

8 files changed

+19
-15
lines changed

Diff for: .github/workflows/push.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Build and Push Docker Images
22
on:
33
push:
4+
paths-ignore:
5+
- "renovate.json"
46
workflow_dispatch:
57
inputs:
68
tag:

Diff for: README.md

+3
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,9 @@ Many dependencies in this repo are automatically updated using [renovate](https:
525525
- these dependencies are automatically merged when our CI tests pass using [automerge](https://docs.renovatebot.com/key-concepts/automerge/#automerging-and-scheduling)
526526
- [github-releases](https://docs.renovatebot.com/modules/datasource/github-releases/) and [github-tags](https://docs.renovatebot.com/modules/datasource/github-tags/) for software we install manually
527527
- [git-refs](https://docs.renovatebot.com/modules/datasource/git-refs/) when we pin to a specific commit on a branch
528+
- [apache-downloads](https://docs.renovatebot.com/modules/datasource/custom) a custom data source that parses the HTML list of releases ([e.g. solr/solr](https://downloads.apache.org/solr/solr/)). This was done since using apache's GitHub repos is not a good indicator when apache cuts a release for their software. Apache's GitHub repos often have tags before apache officially releases their software, resulting in preemptive PRs from renovate before the release is available.
529+
530+
##### Why isle-buildkit can't use Renovate's GitHub app to track updates
528531

529532
Since renovate does not natively support the ability to extract a sha256 from a file, we need [a custom shell script](./ci/update-sha.sh) in the [postUpgradeTasks](https://docs.renovatebot.com/configuration-options/#postupgradetasks) to calculate the sha256 of our files and update our Dockerfile accordingly.
530533

Diff for: activemq/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM java
33

44
ARG TARGETARCH
5-
# renovate: datasource=github-tags depName=apache-activemq packageName=apache/activemq
5+
# renovate: datasource=apache-downloads depName=apache-activemq packageName=activemq
66
ARG ACTIVEMQ_VERSION=5.19.0
77
ARG ACTIVEMQ_FILE="apache-activemq-${ACTIVEMQ_VERSION}-bin.tar.gz"
88
ARG ACTIVEMQ_URL="https://archive.apache.org/dist/activemq/${ACTIVEMQ_VERSION}/${ACTIVEMQ_FILE}"

Diff for: blazegraph/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG BLAZEGRAPH_FILE="blazegraph.war"
77
ARG BLAZEGRAPH_URL="https://github.com/blazegraph/database/releases/download/BLAZEGRAPH_RELEASE_${BLAZEGRAPH_VERSION}/${BLAZEGRAPH_FILE}"
88
ARG BLAZEGRAPH_SHA256="b22f1a1aa8e536443db9a57da63720813374ef59e4021cfa9ad0e98f9a420e85"
99

10-
# renovate: datasource=github-releases depName=apache-log4j packageName=apache/logging-log4j2
10+
# renovate: datasource=apache-downloads depName=apache-log4j packageName=logging/log4j
1111
ARG LOG4J_VERSION=2.24.3
1212
ARG LOG4J_FILE="apache-log4j-${LOG4J_VERSION}-bin.zip"
1313
ARG LOG4J_URL="https://archive.apache.org/dist/logging/log4j/${LOG4J_VERSION}/${LOG4J_FILE}"

Diff for: fits/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ARG FITS_FILE="fits-${FITS_VERSION}.zip"
1515
ARG FITS_URL="https://github.com/harvard-lts/fits/releases/download/${FITS_VERSION}/${FITS_FILE}"
1616
ARG FITS_SHA256="32e436effe7251c5b067ec3f02321d5baf4944b3f0d1010fb8ec42039d9e3b73"
1717

18-
# renovate: datasource=github-releases depName=apache-log4j packageName=apache/logging-log4j2
18+
# renovate: datasource=apache-downloads depName=apache-log4j packageName=logging/log4j
1919
ARG LOG4J_VERSION=2.24.3
2020
ARG LOG4J_FILE="apache-log4j-${LOG4J_VERSION}-bin.zip"
2121
ARG LOG4J_URL="https://archive.apache.org/dist/logging/log4j/${LOG4J_VERSION}/${LOG4J_FILE}"
@@ -57,7 +57,7 @@ ARG \
5757
PIP_VERSION=24.0-r2 \
5858
# renovate: datasource=repology depName=alpine_3_20/python3
5959
PYTHON_VERSION=3.12.9-r0
60-
60+
6161
# Replace linux shared libraries with ones that target muslibc and are platform specific.
6262
# Also add perl for exiftool, and platform specific jna so native libs can be loaded.
6363
#

Diff for: renovate.json

+8-9
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,12 @@
3939
},
4040
{
4141
"matchPackageNames": [
42-
"apache/activemq",
43-
"apache/logging-log4j2",
4442
"fcrepo/fcrepo",
4543
"fcrepo-exts/fcrepo-import-export",
4644
"fcrepo-exts/fcrepo-upgrade-utils",
4745
"pgjdbc/pgjdbc"
4846
],
49-
"extractVersion": "^(REL|fcrepo|activemq|rel|fcrepo-import-export|fcrepo-upgrade-utils)(/|-)?(?<version>\\d+\\.\\d+\\.\\d+)$"
50-
},
51-
{
52-
"extractVersion": "^releases/solr/(?<version>\\d+\\.\\d+\\.\\d+)$",
53-
"matchPackageNames": [
54-
"/^apache/solr$/"
55-
]
47+
"extractVersion": "^(REL|fcrepo|rel|fcrepo-import-export|fcrepo-upgrade-utils)(/|-)?(?<version>\\d+\\.\\d+\\.\\d+)$"
5648
},
5749
{
5850
"extractVersion": "^v(?<version>\\d+\\.\\d+\\.\\d+\\.\\d+)$",
@@ -139,6 +131,13 @@
139131
}
140132
],
141133
"customDatasources": {
134+
"apache-downloads": {
135+
"defaultRegistryUrlTemplate": "https://downloads.apache.org/{{ packageName }}/",
136+
"format": "html",
137+
"transformTemplates": [
138+
"{ \"releases\":[ $map($filter(releases.version,function($v,$i,$a){ $match($v, /^(v)?\\d+\\.\\d+\\.\\d+(\\/)?$/) }),function($v,$i,$a){ { \"version\": $match($v, /\\d+\\.\\d+\\.\\d+/).match } })] }"
139+
]
140+
},
142141
"handle": {
143142
"defaultRegistryUrlTemplate": "https://handle.net/hnr-source/",
144143
"format": "html",

Diff for: solr/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM java
33

44
ARG TARGETARCH
5-
# renovate: datasource=github-tags depName=apache-solr packageName=apache/solr
5+
# renovate: datasource=apache-downloads depName=apache-solr packageName=solr/solr
66
ARG SOLR_VERSION=9.8.1
77
ARG SOLR_FILE=solr-${SOLR_VERSION}.tgz
88
ARG SOLR_URL=https://archive.apache.org/dist/solr/solr/${SOLR_VERSION}/solr-${SOLR_VERSION}.tgz

Diff for: tomcat/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM java
33

44
ARG TARGETARCH
5-
# renovate: datasource=github-tags depName=apache-tomcat packageName=apache/tomcat
5+
# renovate: datasource=apache-downloads depName=apache-tomcat packageName=tomcat/tomcat-9
66
ARG TOMCAT_VERSION=9.0.102
77
ARG TOMCAT_FILE_SHA256="23e0a3b16d53a121c8c86b0ea4e6967d1a4ab689ccf6490ce09eae57ac394787"
88

0 commit comments

Comments
 (0)