Merge pull request #10 from BeniceSoft/dev/feat-v1.0.0

update workflow
BeniceSoft · May 5, 2024 · fda2d45 · fda2d45
2 parents d722f0d + edfcb66
commit fda2d45
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -57,19 +57,9 @@ jobs:
     needs: build-and-push-image
     runs-on: self-hosted
     steps:
-      - name: Get last tag or use latest
-        id: last_tag
-        run: |
-          TAGS="${{ needs.build-and-push-image.outputs.tags }}"
-          LAST_TAG=$(echo "$TAGS" | tr '\n' ' ' | awk -F' ' '{print $NF}')
-          if [ -z "$LAST_TAG" ]; then
-            LAST_TAG="latest"
-          fi
-          echo "::set-output name=tag::$LAST_TAG"
-
       - name: Deploy SSO
-        run: docker service update --image ${{ steps.last_tag.outputs.tag }} --update-parallelism 1 --update-delay 10s --with-registry-auth openauthing_sso
+        run: docker service update --image benicesoft/openauthing-sso:latest --update-parallelism 1 --update-delay 10s --with-registry-auth openauthing_sso
 
-      # - name: Deploy API
-      #   run: docker service update --image ${{ steps.last_tag.outputs.tag }} --update-parallelism 1 --update-delay 10s --with-registry-auth openauthing_api
+      - name: Deploy API
+        run: docker service update --image benicesoft/openauthing-sso:latest --update-parallelism 1 --update-delay 10s --with-registry-auth openauthing_api
 
diff --git a/src/BeniceSoft.OpenAuthing.AdminApi/Dockerfile b/src/BeniceSoft.OpenAuthing.AdminApi/Dockerfile
@@ -17,6 +17,7 @@ COPY ["src/BeniceSoft.OpenAuthing.Domain/BeniceSoft.OpenAuthing.Domain.csproj",
 COPY ["src/BeniceSoft.OpenAuthing.EntityFrameworkCore/BeniceSoft.OpenAuthing.EntityFrameworkCore.csproj", "src/BeniceSoft.OpenAuthing.EntityFrameworkCore/"]
 COPY ["src/BeniceSoft.OpenAuthing.RemoteService.Implements/BeniceSoft.OpenAuthing.RemoteService.Implements.csproj", "src/BeniceSoft.OpenAuthing.RemoteService.Implements/"]
 COPY ["src/BeniceSoft.OpenAuthing.RemoteService.Abstractions/BeniceSoft.OpenAuthing.RemoteService.Abstractions.csproj", "src/BeniceSoft.OpenAuthing.RemoteService.Abstractions/"]
+COPY ["src/BeniceSoft.OpenAuthing.Configuration/BeniceSoft.OpenAuthing.Configuration.csproj", "src/BeniceSoft.OpenAuthing.Configuration/"]
 RUN dotnet restore "src/BeniceSoft.OpenAuthing.AdminApi/BeniceSoft.OpenAuthing.AdminApi.csproj"
 COPY . .
 WORKDIR "/src/src/BeniceSoft.OpenAuthing.AdminApi"

diff --git a/src/BeniceSoft.OpenAuthing.SSO/Dockerfile b/src/BeniceSoft.OpenAuthing.SSO/Dockerfile
@@ -24,6 +24,7 @@ COPY ["src/BeniceSoft.OpenAuthing.EntityFrameworkCore/BeniceSoft.OpenAuthing.Ent
 COPY ["src/BeniceSoft.OpenAuthing.RemoteService.Implements/BeniceSoft.OpenAuthing.RemoteService.Implements.csproj", "src/BeniceSoft.OpenAuthing.RemoteService.Implements/"]
 COPY ["src/BeniceSoft.OpenAuthing.RemoteService.Abstractions/BeniceSoft.OpenAuthing.RemoteService.Abstractions.csproj", "src/BeniceSoft.OpenAuthing.RemoteService.Abstractions/"]
 COPY ["src/BeniceSoft.OpenAuthing.OAuth/BeniceSoft.OpenAuthing.OAuth.csproj", "src/BeniceSoft.OpenAuthing.OAuth/"]
+COPY ["src/BeniceSoft.OpenAuthing.Configuration/BeniceSoft.OpenAuthing.Configuration.csproj", "src/BeniceSoft.OpenAuthing.Configuration/"]
 COPY ["src/BeniceSoft.OpenAuthing.SSO/ClientApp/package*.json", "src/BeniceSoft.OpenAuthing.SSO/ClientApp/"]
 COPY ["src/BeniceSoft.OpenAuthing.SSO/ClientApp/.npmrc", "src/BeniceSoft.OpenAuthing.SSO/ClientApp/"]
 RUN dotnet restore "src/BeniceSoft.OpenAuthing.SSO/BeniceSoft.OpenAuthing.SSO.csproj"