Get version into build image automatically, add docker image labels

This commit is contained in:
Deon George 2025-02-25 09:24:11 +11:00
parent e0e4b0264d
commit f9bd352bfb
2 changed files with 18 additions and 0 deletions

View File

@ -143,7 +143,10 @@ jobs:
ls -al public/js/ ls -al public/js/
- name: Record version and Delete Unnecessary files - name: Record version and Delete Unnecessary files
id: prebuild
run: | run: |
echo "version=$(cat public/VERSION)" >> "$GITHUB_OUTPUT"
echo "revision=${GITHUB_SHA}" >> "$GITHUB_OUTPUT"
echo ${GITHUB_SHA::8} > VERSION echo ${GITHUB_SHA::8} > VERSION
rm -rf .git* tests/ storage/app/test/ rm -rf .git* tests/ storage/app/test/
ls -al public/css/ ls -al public/css/
@ -156,6 +159,9 @@ jobs:
file: docker/Dockerfile file: docker/Dockerfile
push: true push: true
tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}" tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
build-args: |
BUILD_REVISION=${{ steps.prebuild.outputs.revision }}
BUILD_VERSION=${{ steps.prebuild.outputs.version }}
manifest: manifest:
name: Final Docker Image Manifest name: Final Docker Image Manifest

View File

@ -1,5 +1,17 @@
FROM dunglas/frankenphp:php8.4-alpine FROM dunglas/frankenphp:php8.4-alpine
ARG BUILD_VERSION=2.0.0-dev
ARG BUILD_REVISION=00000000
LABEL org.opencontainers.image.vendor="Deon George"
LABEL org.opencontainers.image.licenses=GPLv2
LABEL org.opencontainers.image.source=https://github.com/leenooks/phpldapadmin
LABEL org.opencontainers.image.title=phpLDAPadmin
LABEL org.opencontainers.image.description="An LDAP Administration Tool"
LABEL org.opencontainers.image.url=https://phpldapadmin.org
LABEL org.opencontainers.image.version=${BUILD_VERSION}
LABEL org.opencontainers.image.revision=${BUILD_REVISION}
# Base # Base
RUN apk add --no-cache bash RUN apk add --no-cache bash