Rename job to 'qa' and update Dockerfile base images

argon-chat · Oct 14, 2024 · 4c3c327 · 4c3c327
1 parent a834393
commit 4c3c327
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 31 deletions.
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
@@ -11,39 +11,44 @@ on:
       - 'src/Argon.Api/**'
 
 jobs:
-  build:
-#    if: github.ref == 'refs/heads/master'
+  qa:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - name: Cache Docker layers
-      uses: actions/cache@v2
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-
-    - name: Log in to GitHub Docker Registry
-      uses: docker/login-action@v1
-      with:
-        registry: ${{ secrets.REGISTRY }}
-        username: ${{ secrets.CR_USER }}
-        password: ${{ secrets.CR_PWD }}
-    - name: Build and push
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./src/Argon.Api/Dockerfile
-        push: true
-        tags: reg.staging.svck.dev/argon/api-orleans:${{ github.run_number }}
-        platforms: linux/arm64/v8
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache
+  build:
+    if: github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    needs: qa
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      - name: Log in to GitHub Docker Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ${{ secrets.REGISTRY }}
+          username: ${{ secrets.CR_USER }}
+          password: ${{ secrets.CR_PWD }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./src/Argon.Api/Dockerfile
+          push: true
+          tags: reg.staging.svck.dev/argon/api-orleans:${{ github.run_number }}
+          platforms: linux/arm64/v8
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
diff --git a/src/Argon.Api/Dockerfile b/src/Argon.Api/Dockerfile
@@ -1,10 +1,10 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.18-arm64v8 AS base
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-alpine-arm64v8 AS base
 USER $APP_UID
 WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.18-arm64v8 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine-arm64v8 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["src/Argon.Api/Argon.Api.csproj", "src/Argon.Api/"]