Set VERSIONSUFFIX to docker by default

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5cc0db2d6c961be8cd034eeead9e996cdb962201..51b61260afde9ee09307554343558d09a74e5ee1 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -36,7 +36,7 @@ jobs:
           VERSIONSUFFIX=docker
           if [[ $GITHUB_REF == refs/tags/* ]]; then
             VERSION=${GITHUB_REF#refs/tags/}
-            VERSIONSUFFIX=
+            VERSIONSUFFIX=none
           elif [[ $GITHUB_REF == refs/heads/* ]]; then
             VERSION=nightly
             VERSIONSUFFIX=docker.${{ github.run_number }}

diff --git a/Dockerfile b/Dockerfile
index 932addbb63f4cc83fc254cf518e7e718e10ed674..e8797a7c45b0f0c82e9cf96d3c897a8a6ab76a5d 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 # https://github.com/containerd/containerd/blob/master/platforms/platforms.go#L17
 ARG TARGETARCH
 
-ARG VERSIONSUFFIX
+ARG VERSIONSUFFIX="docker"
 
 WORKDIR /source
 
@@ -31,6 +31,7 @@ RUN case "$TARGETARCH" in \
     arm)    NETCORE_PLATFORM='linux-arm';; \
     *) echo "unsupported architecture"; exit 1 ;; \
   esac && \
+  [[ $VERSIONSUFFIX = "none" ]] && VERSIONSUFFIX=; \
   dotnet publish -c release -o /app -r "$NETCORE_PLATFORM" -p:VersionSuffix="$VERSIONSUFFIX" --no-restore ./src/Impostor.Server/Impostor.Server.csproj
 
 # Final image.