From f5d2f70692840871498369a230aa77d3d058f57c Mon Sep 17 00:00:00 2001 From: Mia Winter Date: Tue, 20 Feb 2024 11:35:20 +0100 Subject: [PATCH] Implemented Versioning --- .github/workflows/docker.yml | 11 ++++++++++- Wave/Components/Layout/MainLayout.razor | 3 +++ Wave/Components/Layout/NavMenu.razor | 2 +- Wave/Dockerfile | 14 ++++++++++++-- Wave/Program.cs | 7 +++++++ Wave/wwwroot/css/main.min.css | 2 +- 6 files changed, 34 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6e0f971..8bf1c2d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,8 +22,15 @@ jobs: images: ${{ env.IMAGE_NAME }} tags: | type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} type=ref,event=tag + labels: | + maintainer=Mia Rose Winter + org.opencontainers.image.title=Wave + org.opencontainers.image.url=https://github.com/miawinter98/wave + org.opencontainers.image.source=https://github.com/miawinter98/wave + org.opencontainers.image.description=The Collaborative Open Source Blogging Engine + org.opencontainers.image.vendor=Winter Software + org.opencontainers.image.licenses=MIT - name: Log into the Container registry uses: docker/login-action@v3 @@ -42,3 +49,5 @@ jobs: file: Wave/Dockerfile tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + build-args: | + VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} diff --git a/Wave/Components/Layout/MainLayout.razor b/Wave/Components/Layout/MainLayout.razor index 9eabb2b..58322e2 100644 --- a/Wave/Components/Layout/MainLayout.razor +++ b/Wave/Components/Layout/MainLayout.razor @@ -87,11 +87,14 @@
+ @Version
@code { + [CascadingParameter(Name = "Version")] + private string Version { get; set; } = string.Empty; [CascadingParameter(Name = "UserTheme")] private string? UserTheme { get; set; } [CascadingParameter] diff --git a/Wave/Components/Layout/NavMenu.razor b/Wave/Components/Layout/NavMenu.razor index e33654f..43e6da3 100644 --- a/Wave/Components/Layout/NavMenu.razor +++ b/Wave/Components/Layout/NavMenu.razor @@ -42,7 +42,7 @@ -