Develop (Merge): Bump Application Version to v0.2.2-alpha and Fix Doc…

…kerfile and Workflow Bump Application Version to v0.2.2-alpha and Fix Dockerfile and Workflow
ktutak1337 · Jul 27, 2024 · d60d15c · d60d15c
2 parents 6591b0e + 2e8b3e4
commit d60d15c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/.github/workflows/docker-build-and-publish.yaml b/.github/workflows/docker-build-and-publish.yaml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Extract version from tag  
         id: extract_version  
-        run: echo "::set-output name=version::${GITHUB_REF#refs/tags/v}"
+        run: echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
 
       - name: Build and push Docker images for web api
         uses: docker/build-push-action@v6.5.0
@@ -37,9 +37,9 @@ jobs:
           file: docker/webapi/Dockerfile  
           platforms: linux/amd64,linux/arm64  
           push: true  
-          tags: |  
-            stellarchat-api:${{ steps.extract_version.outputs.version }}  
-            stellarchat-api:latest
+          tags: |
+            ${{ vars.DOCKER_IMAGE_NAME }}/stellarchat-api:${{ env.version }}  
+            ${{ vars.DOCKER_IMAGE_NAME }}/stellarchat-api:latest
 
       - name: Build and push Docker images for web app
         uses: docker/build-push-action@v6.5.0
@@ -48,6 +48,6 @@ jobs:
           file: docker/webapp/Dockerfile  
           platforms: linux/amd64,linux/arm64  
           push: true  
-          tags: |  
-            stellarchat-web:${{ steps.extract_version.outputs.version }}  
-            stellarchat-web:latest
+          tags: |
+            ${{ vars.DOCKER_IMAGE_NAME }}/stellarchat-web:${{ env.version }}  
+            ${{ vars.DOCKER_IMAGE_NAME }}/stellarchat-web:latest
diff --git a/docker/webapi/Dockerfile b/docker/webapi/Dockerfile
@@ -1,11 +1,14 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+ARG PLATFORM=$BUILDPLATFORM
+
+FROM --platform=$PLATFORM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 8080
 EXPOSE 8443
 
 RUN adduser --disabled-password --gecos "" stellar
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG PLATFORM
+FROM --platform=$PLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ../../src/Server src/Server

diff --git a/docker/webapp/Dockerfile b/docker/webapp/Dockerfile
@@ -1,4 +1,6 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG PLATFORM=$BUILDPLATFORM
+
+FROM --platform=$PLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 
 WORKDIR /src
 COPY ../../src/Shared/StellarChat.Shared.Contracts/StellarChat.Shared.Contracts.csproj src/Shared/StellarChat.Shared.Contracts/
@@ -16,7 +18,8 @@ FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
 RUN dotnet publish ./src/Client/StellarChat.Client.Web/StellarChat.Client.Web.csproj -c $BUILD_CONFIGURATION -o /app/publish
 
-FROM nginx:1.27.0-alpine AS final
+ARG PLATFORM
+FROM --platform=$PLATFORM nginx:1.27.0-alpine AS final
 WORKDIR /usr/share/nginx/html
 COPY --from=publish /app/publish/wwwroot .
 COPY /docker/webapp/nginx.conf /etc/nginx/nginx.conf

diff --git a/src/Client/StellarChat.Client.Web/wwwroot/appsettings.json b/src/Client/StellarChat.Client.Web/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
 {
   "app": {
     "name": "Stellar Chat",
-    "version": "v0.2.1-alpha",
+    "version": "v0.2.2-alpha",
     "logoLarge": "",
     "logoSmall": "https://raw.githubusercontent.com/ktutak1337/Stellar-Chat/main/docs/assets/logo-small.jpg",
     "releases": "https://github.com/ktutak1337/Stellar-Chat/releases"

diff --git a/src/Server/StellarChat.Server.Api/appsettings.json b/src/Server/StellarChat.Server.Api/appsettings.json
@@ -1,7 +1,7 @@
 {
   "app": {
     "name": "Stellar Chat",
-    "version": "v0.2.1-alpha"
+    "version": "v0.2.2-alpha"
   },
   "AllowedHosts": "*",
   "openAI": {