Docker related updates

.docker/Dockerfile

@@ -1,4 +1,6 @@
-FROM eclipse-temurin:11 as jre-build
+ARG ARCH_BASE
+FROM $ARCH_BASE as jre-build
+
 WORKDIR /app
 
 ARG VERSION
@@ -21,9 +23,7 @@ RUN $JAVA_HOME/bin/jlink \
          --compress=2 \
          --output /javaruntime
 
-RUN apt-get -y update && \
-    apt-get -y install maven curl zip && \
-    rm -rf /var/lib/apt/lists/*
+RUN apk add maven curl zip
 
 # Compile with maven, extract binaries and copy into image
 COPY . /app
@@ -32,7 +32,7 @@ RUN unzip target/shacl-${VERSION}-bin.zip -d /app/
 
 # BUILD STAGE 2: keep only Java and SHACL
 
-FROM ubuntu:jammy
+FROM alpine:3.18
 
 ARG VERSION
 
@@ -42,5 +42,4 @@ ENV PATH "/app/shacl-${VERSION}/bin:${PATH}"
 COPY --from=jre-build /javaruntime $JAVA_HOME
 COPY --chmod=0755 --from=jre-build /app/shacl-${VERSION} /app/shacl-${VERSION}
 COPY --chmod=0755 --from=jre-build "/app/.docker/entrypoint.sh" "/entrypoint.sh"
-
 ENTRYPOINT ["/entrypoint.sh"]

.docker/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
@@ -27,4 +27,4 @@ EOF
 	exit 1
 fi
 
-exec "$@"
+exec "$@"

.gitattributes

@@ -0,0 +1,10 @@
+# By default, normalize line endings
+* text=auto
+
+# Force microsofty files to use CRLF
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
+*.{reg,[rR][eE][gG]} text eol=crlf
+
+# Force Unix bash files to use LF
+*.sh text eol=lf

.github/workflows/docker-image.yml

@@ -8,16 +8,26 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
+    strategy:
+      matrix:
+        include:
+          - platform: linux/amd64
+            base: eclipse-temurin:11-alpine
+          - platform: linux/arm64
+            base: amazoncorretto:11-alpine3.18-jdk
 
     steps:
+      - name: lowercase image name
+        run: |
+          echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
+
       - name: Checkout repository
         uses: actions/checkout@v3
 
@@ -62,13 +72,88 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
         # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
+      - name: Build and push Docker image for x86 and arm64
+        id: build
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 #v4.0.0
         with:
           file: .docker/Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta.outputs.tags }}
+          platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: VERSION=${{ steps.get_version.outputs.version_build }}
-          outputs: type=image
+          build-args: |
+            VERSION=${{ steps.get_version.outputs.version_build }}
+            ARCH_BASE=${{ matrix.base }}
+          outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
+
+        # https://github.com/actions/upload-artifact
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"          
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+      runs-on: ubuntu-latest
+      needs:
+        - build-and-push-image
+      steps:
+        - name: lowercase image name
+          run: |
+            echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
+
+        - name: Checkout repository
+          uses: actions/checkout@v3
+
+          # inspired by https://github.com/reloc8/action-latest-release-version
+        - name: Get release version
+          id: get_version
+          run: |
+            git fetch --tags
+            git fetch --prune --unshallow || true
+
+            LATEST_RELEASE=$(git describe --abbrev=0 --tags | sed 's/^v//')
+            echo "latest-release=${LATEST_RELEASE}" >> $GITHUB_OUTPUT
+            echo "version_build=${LATEST_RELEASE}_"$(git rev-parse --short "$GITHUB_SHA") >> $GITHUB_OUTPUT
+
+          # https://github.com/actions/download-artifact
+        - name: Download digests
+          uses: actions/download-artifact@v3
+          with:
+            name: digests
+            path: /tmp/digests
+        - name: Set up Docker Buildx
+          uses: docker/setup-buildx-action@v3
+
+          # https://github.com/docker/metadata-action
+        - name: Extract metadata (tags, labels) for Docker
+          id: meta
+          uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96 #v4.3.0
+          with:
+            images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+            tags: |
+                type=raw,value=latest,enable=${{ github.event_name == 'push' }}
+                type=raw,value=${{ steps.get_version.outputs.version_build}},enable=${{ github.event_name == 'push' }}
+                type=raw,value=${{ steps.get_version.outputs.latest-release}},enable=${{ github.event_name == 'release' }}
+
+          # https://github.com/docker/login-action
+        - name: Log in to the Container registry
+          uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
+          with:
+            registry: ${{ env.REGISTRY }}
+            username: ${{ github.actor }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+        - name: Create manifest list and push
+          working-directory: /tmp/digests
+          run: |
+            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+              $(printf '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)          
+        - name: Inspect image
+          run: |
+            docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}          

README.md

@@ -41,6 +41,7 @@ Releases are available in the central maven repository:
   <version>*VER*</version>
 </dependency>
 ```
+
 ## Command Line Usage
 
 Download the latest release from:
@@ -58,15 +59,15 @@ To use them, set up your environment similar to https://jena.apache.org/document
 For example, on Windows:
 
 ```
-SET SHACLROOT=C:\Users\Holger\Desktop\shacl-1.4.1-bin
+SET SHACLROOT=C:\Users\Holger\Desktop\shacl-1.4.2-bin
 SET PATH=%PATH%;%SHACLROOT%\bin
 ```
 
 As another example, for Linux, add to .bashrc these lines:
 
 ```
 # for shacl
-export SHACLROOT=/home/holger/shacl/shacl-1.4.1-bin/shacl-1.4.1/bin
+export SHACLROOT=/home/holger/shacl/shacl-1.4.2-bin/shacl-1.4.2/bin
 export PATH=$SHACLROOT:$PATH 
 ```
 
@@ -83,11 +84,12 @@ The tools print the validation report or the inferences graph to the output scre
 
 ## Dockerfile Usage
 
-The `Dockerfile` in the `.docker` folder includes a minimal Java Runtime Environment for the SHACL API that clocks in at 144Mb. To build the docker image use:
+The `Dockerfile` in the `.docker` folder includes a minimal Java Runtime Environment for the SHACL API that clocks in at ~85Mb. To get the latest release of the image use:
 
 ```
 docker build -f .docker/Dockerfile -t ghcr.io/topquadrant/shacl:1.4.2 --build-arg VERSION=1.4.2 .
 ```
+> :warning: It is generally better to use a fixed version of the docker image, rather than the `latest` tag. Consult the package page to find what versions are available.
 
 To use the Docker image, there are two possible commands. To run the validator:
 
@@ -117,3 +119,15 @@ PARAMETERS:
 	-shapesfile /data/myshapes.ttl [OPTIONAL]
 		shapes for validation (only .ttl format supported)
 ```
+
+If you'd like to build the image locally in an `x86` architecture, use:
+
+```
+docker build -f .docker/Dockerfile -t ghcr.io/topquadrant/shacl:1.4.2 --build-arg VERSION=1.4.2 --build-arg ARCH_BASE=eclipse-temurin:11-alpine .
+```
+
+If your architecture is `arm`, use:
+
+```
+docker build -f .docker/Dockerfile -t ghcr.io/topquadrant/shacl:1.4.2 --build-arg VERSION=1.4.2 --build-arg ARCH_BASE=amd64/eclipse-temurin:11-alpine .
+```