diff --git a/ci/java-builder/Dockerfile b/ci/java-builder/Dockerfile index 094c520..8a83f16 100644 --- a/ci/java-builder/Dockerfile +++ b/ci/java-builder/Dockerfile @@ -4,17 +4,17 @@ # Contains: Java 21, Maven 3.9.9, common dependencies, OWASP NVD database. # # Build: -# docker build -t registry.kollect.biz/kollect-ci/java-builder:latest ci/java-builder/ +# docker build -t 192.168.1.72/kollect-tools/java-builder:latest ci/java-builder/ # # Usage in CI: # container: -# image: registry.kollect.biz/kollect-ci/java-builder:latest +# image: 192.168.1.72/kollect-tools/java-builder:latest ARG JAVA_VERSION=21 FROM eclipse-temurin:${JAVA_VERSION}-jdk-jammy -ARG MAVEN_VERSION=3.9.9 -ARG OWASP_DC_VERSION=12.1.1 +ARG MAVEN_VERSION=3.9.14 +ARG OWASP_DC_VERSION=12.1.0 # ───────────────────────────────────────────────────────────────────── # System dependencies # ───────────────────────────────────────────────────────────────────── @@ -31,7 +31,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ENV MAVEN_HOME=/opt/maven ENV PATH="${MAVEN_HOME}/bin:${PATH}" -RUN curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" \ +RUN curl -fsSL "https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" \ | tar -xz -C /opt \ && mv "/opt/apache-maven-${MAVEN_VERSION}" "${MAVEN_HOME}" diff --git a/ci/java-builder/README.md b/ci/java-builder/README.md index 1177407..22c88db 100644 --- a/ci/java-builder/README.md +++ b/ci/java-builder/README.md @@ -15,8 +15,8 @@ Pre-baked build environment for KollectAI-ETL backend and plugin CI jobs. ## Build ```bash -docker build -t registry.kollect.biz/kollect-ci/java-builder:latest ci/java-builder/ -docker push registry.kollect.biz/kollect-ci/java-builder:latest +docker build -t 192.168.1.72/kollect-tools/java-builder:latest ci/java-builder/ +docker push 192.168.1.72/kollect-tools/java-builder:latest ``` ### Build args @@ -35,7 +35,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: registry.kollect.biz/kollect-ci/java-builder:latest + image: 192.168.1.72/kollect-tools/java-builder:latest steps: - uses: actions/checkout@v6 - run: ./mvnw -f backend/etl/pom.xml test -Dgroups=unit -q @@ -46,8 +46,8 @@ jobs: Rebuild weekly to keep the OWASP NVD database fresh: ```bash -docker build --no-cache -t registry.kollect.biz/kollect-ci/java-builder:latest ci/java-builder/ -docker push registry.kollect.biz/kollect-ci/java-builder:latest +docker build --no-cache -t 192.168.1.72/kollect-tools/java-builder:latest ci/java-builder/ +docker push 192.168.1.72/kollect-tools/java-builder:latest ``` When `pom.xml` files change (new dependencies), rebuild to update the cached deps layer.