MateuszSkoczek/WatchIt
1
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

fix

Browse Source
This commit is contained in:
Mateusz Skoczek
2024-09-24 15:59:31 +02:00
Unverified
parent 8b90a1e4e5
commit 849c4fa06b
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/master_push.yml vendored
View File

@@ -46,7 +46,7 @@ jobs:
with: with:
useConfigFile: true useConfigFile: true
configFilePath: .github/config/gitversion.yml configFilePath: .github/config/gitversion.yml
- name: App Settings Variable Substitution - name: App Settings Variable Substitution for WatchIt.WebAPI
uses: microsoft/variable-substitution@v1 uses: microsoft/variable-substitution@v1
if: ${{ matrix.app == 'WatchIt.WebAPI' }} if: ${{ matrix.app == 'WatchIt.WebAPI' }}
with: with:
@@ -56,6 +56,13 @@ jobs:
RootUser.Email: ${{ secrets.ROOT_EMAIL }} RootUser.Email: ${{ secrets.ROOT_EMAIL }}
RootUser.Password: ${{ secrets.ROOT_PASSWORD }} RootUser.Password: ${{ secrets.ROOT_PASSWORD }}
Authentication.Key: ${{ secrets.KEY }} Authentication.Key: ${{ secrets.KEY }}
- name: App Settings Variable Substitution for WatchIt.Website
uses: microsoft/variable-substitution@v1
if: ${{ matrix.app == 'WatchIt.Website' }}
with:
files: ${{ github.workspace }}/${{ matrix.app }}/${{ matrix.app }}/appsettings.json
env:
Endpoints.Base: ${{ secrets.API_URL }}
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
@@ -123,6 +130,8 @@ jobs:
- name: Pull new WatchIt.Website image - name: Pull new WatchIt.Website image
run: docker pull ghcr.io/mateuszskoczek/watchit.website:latest run: docker pull ghcr.io/mateuszskoczek/watchit.website:latest
- name: Run new WatchIt.WebAPI container - name: Run new WatchIt.WebAPI container
run: docker run -p 8080:8080 -p 8081:8081 -d --name watchit.webapi ghcr.io/mateuszskoczek/watchit.webapi:latest run: docker run -p 8080:1080 -p 8081:1443 -e ASPNETCORE_URLS="https://+;http://+" -d --name watchit.webapi ghcr.io/mateuszskoczek/watchit.webapi:latest
- name: Run new WatchIt.Website container
run: docker run -p 8080:80 -p 8081:443 -e ASPNETCORE_URLS="https://+;http://+" -d --name watchit.webapi ghcr.io/mateuszskoczek/watchit.website:latest
- name: Wait for initialization - name: Wait for initialization
run: sleep 10 run: sleep 10

2
WatchIt.Database/WatchIt.Database.Model/WatchIt.Database.Model.Seeding/DataReader.cs
View File

@@ -11,8 +11,6 @@ public class DataReader
public static IEnumerable<T> Read<T>(string filename) public static IEnumerable<T> Read<T>(string filename)
{ {
string jsonFile = $@"{AppContext.BaseDirectory}/Data/{filename}.json"; string jsonFile = $@"{AppContext.BaseDirectory}/Data/{filename}.json";
Console.WriteLine(string.Join('\n', Directory.GetDirectories($@"{AppContext.BaseDirectory}")));
Debug.WriteLine(string.Join('\n', Directory.GetDirectories($@"{AppContext.BaseDirectory}")));
string dataString = File.ReadAllText(jsonFile); string dataString = File.ReadAllText(jsonFile);
IEnumerable<T>? data = JsonSerializer.Deserialize<IEnumerable<T>>(dataString); IEnumerable<T>? data = JsonSerializer.Deserialize<IEnumerable<T>>(dataString);
if (data is null) if (data is null)