build: Update libraries to latest version

This commit is contained in:
2026-04-30 09:52:04 +08:00
parent 1f3c4e2102
commit 58e25ebd4d
8 changed files with 117 additions and 91 deletions
+4 -4
View File
@@ -9,7 +9,7 @@
# workflow, so we don't bake it into the shared java-builder.
#
# Build:
# docker build -t 192.168.1.72/kollect-tools/ci/sonar-runner:latest ci/sonar-runner/
# docker build -t kcr.kollect.biz/kollect-tools/ci/sonar-runner:latest ci/sonar-runner/
#
# Build prerequisite: java-builder:latest must exist in the registry
# (this image FROMs it). Run `build-and-push.ps1 -Image ci/java-builder`
@@ -17,15 +17,15 @@
#
# Usage in CI:
# container:
# image: 192.168.1.72/kollect-tools/ci/sonar-runner:latest
# image: kcr.kollect.biz/kollect-tools/ci/sonar-runner:latest
ARG REGISTRY=192.168.1.72
ARG REGISTRY=kcr.kollect.biz
ARG JAVA_BUILDER_TAG=latest
FROM ${REGISTRY}/kollect-tools/ci/java-builder:${JAVA_BUILDER_TAG}
# Sonar-scanner version. Bump in lockstep with KollectAI-ETL's
# .gitea/workflows/sonar.yml SONAR_SCANNER_VERSION env.
ARG SONAR_SCANNER_VERSION=6.2.1.4610
ARG SONAR_SCANNER_VERSION=8.1.0.6389
# ─────────────────────────────────────────────────────────────────────
# sonar-scanner CLI
+5 -5
View File
@@ -12,17 +12,17 @@ Everything from [`java-builder`](../java-builder/) (Java 25, Maven 3.9.x, Node +
```bash
# Prerequisite: java-builder must already exist in the registry.
docker build -t 192.168.1.72/kollect-tools/ci/sonar-runner:latest ci/sonar-runner/
docker push 192.168.1.72/kollect-tools/ci/sonar-runner:latest
docker build -t kcr.kollect.biz/kollect-tools/ci/sonar-runner:latest ci/sonar-runner/
docker push kcr.kollect.biz/kollect-tools/ci/sonar-runner:latest
```
### Build args
| Arg | Default | Description |
|-----|---------|-------------|
| `REGISTRY` | `192.168.1.72` | Registry hostname for the parent `java-builder` pull |
| `REGISTRY` | `kcr.kollect.biz` | Registry hostname for the parent `java-builder` pull |
| `JAVA_BUILDER_TAG` | `latest` | Tag of `java-builder` to extend |
| `SONAR_SCANNER_VERSION` | `6.2.1.4610` | Bump in lockstep with `KollectAI-ETL/.gitea/workflows/sonar.yml`'s `SONAR_SCANNER_VERSION` |
| `SONAR_SCANNER_VERSION` | `8.1.0.6389` | Bump in lockstep with `KollectAI-ETL/.gitea/workflows/sonar.yml`'s `SONAR_SCANNER_VERSION` |
## Usage in CI
@@ -31,7 +31,7 @@ jobs:
scan:
runs-on: ubuntu-latest
container:
image: 192.168.1.72/kollect-tools/ci/sonar-runner:latest
image: kcr.kollect.biz/kollect-tools/ci/sonar-runner:latest
steps:
- uses: actions/checkout@v6
with: