diff --git a/Dockerfile b/Dockerfile index 8b0b83f..a834f0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,9 @@ ## This Dockefile builds a reduced footprint container. -ARG ALPINE_VERSION=3.18.2 -ARG JENA_VERSION="4.9.0" +ARG ALPINE_VERSION=3.18.4 +ARG JDK_VERSION=21.0.1_12 +ARG JENA_VERSION="4.10.0" ARG JVM_ARGS="-Xmx2048m -Xms2048m" # Internal, passed between stages. @@ -27,7 +28,7 @@ ARG FUSEKI_BASE=/fuseki ARG JAVA_MINIMAL=/opt/java-minimal ## ---- Stage: Download and build java. -FROM alpine:${ALPINE_VERSION} AS build-stage +FROM eclipse-temurin:${JDK_VERSION}-jdk-alpine AS build-stage ARG JENA_VERSION ARG FUSEKI_HOME @@ -43,7 +44,7 @@ RUN [ "${JENA_VERSION}" != "" ] || { echo -e '\n**** Set JENA_VERSION ****\n' ; RUN echo && echo "==== Docker build for Apache Jena Fuseki ${JENA_VERSION} ====" && echo # Alpine: For objcopy used in jlink -RUN apk add --no-cache curl tar openjdk17 binutils +RUN apk add --no-cache curl tar binutils ## -- Fuseki binaries in FUSEKI_HOME. WORKDIR /tmp diff --git a/README.md b/README.md index aed3dea..6bd00f8 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ This project builds Docker image and a helm chart for chosen version of [Fuseki ## Building docker image The Docker image building process takes the following arguments: -`JENA_VERSION` defaulted to `4.9.0` +`JENA_VERSION` defaulted to `4.10.0` `OPENJDK_VERSION` defaulted to `17` `ALPINE_VERSION` defaulted to `3.18.2` To build the Docker image manually the following command can be used: ``` -docker build --force-rm --build-arg JENA_VERSION=4.9.0 -t fuseki . +docker build --force-rm --build-arg JENA_VERSION=4.10.0 -t fuseki . ``` It's possible to build the image for `linux/amd64` and `linux/arm64` platforms. @@ -26,7 +26,7 @@ There are certain environment variables that might be set before running the ima An example `docker run` command starting Fuseki server may look like follows: ``` -docker run -i --rm -p "3030:3030" -e 'FUSEKI_BASE=/fuseki' --mount type=bind,src=/tmp/jena,dst=/fuseki -t fuseki +docker run -i --rm -p "3030:3030" -e 'FUSEKI_BASE=/fuseki' --mount type=bind,src="$(pwd)"/target,dst=/fuseki -t fuseki ``` Additionally, other files might be mounted to the server to customise certain its aspects: diff --git a/chartpress.yaml b/chartpress.yaml index cc795a2..7a4daea 100644 --- a/chartpress.yaml +++ b/chartpress.yaml @@ -13,4 +13,4 @@ charts: dockerfilePath: Dockerfile valuesPath: image buildArgs: - JENA_VERSION: "4.9.0" + JENA_VERSION: "4.10.0" diff --git a/renku-jena/Chart.yaml b/renku-jena/Chart.yaml index 107d1e0..dcf1414 100644 --- a/renku-jena/Chart.yaml +++ b/renku-jena/Chart.yaml @@ -15,10 +15,10 @@ description: A Helm chart for Kubernetes # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.21 +version: 0.0.22 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "4.9.0" +appVersion: "4.10.0" diff --git a/renku-jena/values.yaml b/renku-jena/values.yaml index 95deba1..b1c576a 100644 --- a/renku-jena/values.yaml +++ b/renku-jena/values.yaml @@ -6,7 +6,7 @@ image: repository: renku/renku-jena pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: '0.0.21' + tag: '0.0.22' imagePullSecrets: [] nameOverride: ""