Merge pull request #65 from SaintAngeLs/dev

(#62) test for the deploy action
SaintAngeLs · Apr 20, 2024 · 8855e13 · 8855e13
2 parents 8b6e214 + 66e32d4
commit 8855e13
Show file tree

Hide file tree

Showing 395 changed files with 11,369 additions and 238 deletions.
diff --git a/.github/workflows/azure_synchronisation.yml b/.github/workflows/azure_synchronisation.yml
@@ -28,7 +28,8 @@ jobs:
           AZURE_DEVOPS_USERNAME: ${{ secrets.AZURE_DEVOPS_USERNAME }}
           AZURE_DEVOPS_PASSWORD: ${{ secrets.AZURE_DEVOPS_PASSWORD }} 
         run: |
-          git remote add azure https://$AZURE_DEVOPS_USERNAME:$AZURE_DEVOPS_PASSWORD@dev.azure.com/SocialAppOIPproject/SocialApp_IO/_git/SocialApp_IO
+          # git remote add azure https://$AZURE_DEVOPS_USERNAME:$AZURE_DEVOPS_PASSWORD@dev.azure.com/SocialAppOIPproject/SocialApp_IO/_git/SocialApp_IO
+          git remote add azure https://$AZURE_DEVOPS_PAT@dev.azure.com/SocialAppOIPproject/SocialApp_IO/_git/SocialApp_IO
 
       - name: Push all branches to Azure DevOps
         run: git push azure --all --force

diff --git a/.github/workflows/cloud_deploy.yml b/.github/workflows/cloud_deploy.yml
@@ -3,7 +3,7 @@ name: Deploy to Cloud
 on:
   push:
     branches:
-      - main
+      - main # dev for the test purposes here
   pull_request:
     branches:
       - main 
@@ -21,7 +21,7 @@ jobs:
         echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
         chmod 600 ~/.ssh/id_rsa
         ssh-keyscan -H ${{ secrets.DROPLET_IP }} >> ~/.ssh/known_hosts
-        cat ~/.ssh/known_hosts # Add this line to confirm that the key is added
+        cat ~/.ssh/known_hosts 
 
     - name: Check the structure
       run: |

diff --git a/MiniSpace.APIGateway/Dockerfile b/MiniSpace.APIGateway/Dockerfile
@@ -1,12 +1,17 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /app
+
 COPY . .
-RUN dotnet publish src/MiniSpace.APIGateway -c release -o out
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1
+RUN dotnet publish src/MiniSpace.APIGateway -c Release -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
+
 COPY --from=build /app/out .
-ENV ASPNETCORE_URLS http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-ENV NTRADA_CONFIG ntrada.docker
-ENTRYPOINT dotnet MiniSpace.APIGateway.dll
+
+ENV ASPNETCORE_URLS=http://*:80
+ENV ASPNETCORE_ENVIRONMENT=docker
+ENV NTRADA_CONFIG=ntrada.docker
+
+ENTRYPOINT ["dotnet", "MiniSpace.APIGateway.dll"]
diff --git a/MiniSpace.APIGateway/scripts/dockerize-tag-push.sh b/MiniSpace.APIGateway/scripts/dockerize-tag-push.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export ASPNETCORE_ENVIRONMENT=Development
+export ASPNETCORE_ENVIRONMENT=docker
 
 cd ..
 

diff --git a/MiniSpace.APIGateway/src/MiniSpace.APIGateway/MiniSpace.APIGateway.csproj b/MiniSpace.APIGateway/src/MiniSpace.APIGateway/MiniSpace.APIGateway.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <RootNamespace>MiniSpace.APIGateway</RootNamespace>
   </PropertyGroup>

diff --git a/MiniSpace.APIGateway/src/MiniSpace.APIGateway/Properties/launchSettings.json b/MiniSpace.APIGateway/src/MiniSpace.APIGateway/Properties/launchSettings.json
@@ -14,7 +14,7 @@
         "ASPNETCORE_ENVIRONMENT": "local"
       }
     },
-    "Pacco.APIGateway": {
+    "MiniSpace.APIGateway": {
       "commandName": "Project",
       "launchBrowser": false,
       "applicationUrl": "http://localhost:5000",