diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 9dee1f3f6f0..0672ead0430 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -33,7 +33,6 @@ jobs: - java8-graalvm-ce - java8-openj9 - java8-jdk - - java11 include: # JAVA 23 - variant: java23 @@ -75,11 +74,6 @@ jobs: baseImage: eclipse-temurin:17-jre-alpine platforms: linux/amd64 mcVersion: 1.20.4 - # JAVA 11: - - variant: java11 - baseImage: adoptopenjdk:11-jre-hotspot - platforms: linux/amd64,linux/arm/v7,linux/arm64 - mcVersion: 1.16.5 # JAVA 8: NOTE: Unable to go past 8u312 because of Forge dependencies - variant: java8 baseImage: eclipse-temurin:8u312-b07-jre-focal @@ -207,5 +201,8 @@ jobs: build-args: | BASE_IMAGE=${{ matrix.baseImage }} BUILD_FILES_REV=${{ steps.build-files-rev.outputs.REV }} + BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }} + VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} + REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} cache-from: type=gha,scope=${{ matrix.variant }} cache-to: type=gha,mode=max,scope=${{ matrix.variant }} diff --git a/Dockerfile b/Dockerfile index 8025a48c5ec..b5b18ca86bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,3 +78,8 @@ RUN dos2unix /start* /auto/* ENTRYPOINT [ "/start" ] HEALTHCHECK --start-period=2m --retries=2 --interval=30s CMD mc-health + +ARG BUILDTIME=local +ARG VERSION=local +ARG REVISION=local +RUN echo "buildtime=${BUILDTIME}\nversion=${VERSION}\nrevision=${REVISION}" > /etc/image.properties diff --git a/scripts/start-configuration b/scripts/start-configuration index e6ff2f40b30..06ff97569d7 100755 --- a/scripts/start-configuration +++ b/scripts/start-configuration @@ -32,6 +32,7 @@ isDebugging && set -x export HOME=/data log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'" +log "Image info: $(paste -d, -s /etc/image.properties)" if [ ! -e /data/eula.txt ]; then if ! isTrue "$EULA"; then