Skip to content

Commit

Permalink
Merge pull request #65 from SaintAngeLs/dev
Browse files Browse the repository at this point in the history
(#62) test for the deploy action
  • Loading branch information
SaintAngeLs committed Apr 20, 2024
2 parents 8b6e214 + 66e32d4 commit 8855e13
Show file tree
Hide file tree
Showing 395 changed files with 11,369 additions and 238 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/azure_synchronisation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]/SocialAppOIPproject/SocialApp_IO/_git/SocialApp_IO
# git remote add azure https://$AZURE_DEVOPS_USERNAME:[email protected]/SocialAppOIPproject/SocialApp_IO/_git/SocialApp_IO
git remote add azure https://[email protected]/SocialAppOIPproject/SocialApp_IO/_git/SocialApp_IO
- name: Push all branches to Azure DevOps
run: git push azure --all --force
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cloud_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy to Cloud
on:
push:
branches:
- main
- main # dev for the test purposes here
pull_request:
branches:
- main
Expand All @@ -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: |
Expand Down
19 changes: 12 additions & 7 deletions MiniSpace.APIGateway/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
2 changes: 1 addition & 1 deletion MiniSpace.APIGateway/scripts/dockerize-tag-push.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export ASPNETCORE_ENVIRONMENT=Development
export ASPNETCORE_ENVIRONMENT=docker

cd ..

Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"ASPNETCORE_ENVIRONMENT": "local"
}
},
"Pacco.APIGateway": {
"MiniSpace.APIGateway": {
"commandName": "Project",
"launchBrowser": false,
"applicationUrl": "http://localhost:5000",
Expand Down
Loading

0 comments on commit 8855e13

Please sign in to comment.