Skip to content

Commit

Permalink
chore: alpine 3.18.4, jdk 21.0.1_12, jena 4.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jachro committed Nov 2, 2023
1 parent f6da3a1 commit 9216b08
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion chartpress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ charts:
dockerfilePath: Dockerfile
valuesPath: image
buildArgs:
JENA_VERSION: "4.9.0"
JENA_VERSION: "4.10.0"
4 changes: 2 additions & 2 deletions renku-jena/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion renku-jena/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down

0 comments on commit 9216b08

Please sign in to comment.