Compare commits

..

4 Commits

Author SHA1 Message Date
f5b2c28028 Update CI/CD to build the image with the appropriate tag
Some checks failed
Create Docker Image / Test Application (x86_64) (push) Successful in 27s
Create Docker Image / Build Docker Image (x86_64) (push) Failing after 12s
Create Docker Image / Build Docker Image (arm64) (push) Failing after 38s
Create Docker Image / Final Docker Image Manifest (push) Has been skipped
2025-03-04 08:20:45 +11:00
bfb7f5315e Fixes to customation of ArchitectUI for mobile displays, hamburger should now be visibile and search is not black on black.
Closes #292
2025-03-04 08:17:46 +11:00
afaab0993f Update ArchitectUI to v4 2025-03-04 08:17:46 +11:00
2a8052a0d7 Update CI/CD to build the image with the appropriate tag 2025-03-04 08:17:46 +11:00

View File

@ -84,8 +84,7 @@ jobs:
privileged: true
env:
ARCH: ${{ matrix.arch }}
VERSION: ${{ env.GITHUB_REF_NAME }}
VERSIONARCH: ${{ env.VERSION }}-${{ env.ARCH }}
VERSIONARCH: ${{ env.GITHUB_REF_NAME }}-${{ env.ARCH }}
steps:
- name: Environment Setup
@ -146,7 +145,7 @@ jobs:
id: prebuild
run: |
echo ${GITHUB_SHA::8} > VERSION
[ "${{ env.GITHUB_REF_TYPE }}" -eq "tag" ] && echo v${{ env.VERSION }}-rel > public/VERSION
[ "${GITHUB_REF_TYPE}" -eq "tag" ] && echo v${GITHUB_REF_NAME}-rel > public/VERSION
rm -rf .git* tests/ storage/app/test/
# ls -al public/css/
# ls -al public/js/
@ -160,7 +159,7 @@ jobs:
tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
build-args: |
BUILD_REVISION=${{ env.GITHUB_SHA }}
BUILD_VERSION=v${{ env.VERSION }}
BUILD_VERSION=v${{ env.GITHUB_REF_NAME }}
manifest:
name: Final Docker Image Manifest
@ -195,7 +194,8 @@ jobs:
- name: Build Docker Manifest
run: |
docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }} \
${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-x86_64 \
${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-arm64
docker manifest push --purge ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}
docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.GITHUB_REF_NAME }} \
${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.GITHUB_REF_NAME }}-x86_64 \
${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.GITHUB_REF_NAME }}-arm64
docker manifest push --purge ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.GITHUB_REF_NAME }}
echo "Built container: ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.GITHUB_REF_NAME }}" >> $GITHUB_STEP_SUMMARY