From 849c4fa06b80306d6441d89a4f84a943d9c30582 Mon Sep 17 00:00:00 2001 From: Mateusz Skoczek Date: Tue, 24 Sep 2024 15:59:31 +0200 Subject: [PATCH] fix --- .github/workflows/master_push.yml | 15 ++++++++++++--- .../WatchIt.Database.Model.Seeding/DataReader.cs | 2 -- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master_push.yml b/.github/workflows/master_push.yml index a0cf4fd..9de7085 100644 --- a/.github/workflows/master_push.yml +++ b/.github/workflows/master_push.yml @@ -46,7 +46,7 @@ jobs: with: useConfigFile: true configFilePath: .github/config/gitversion.yml - - name: App Settings Variable Substitution + - name: App Settings Variable Substitution for WatchIt.WebAPI uses: microsoft/variable-substitution@v1 if: ${{ matrix.app == 'WatchIt.WebAPI' }} with: @@ -56,6 +56,13 @@ jobs: RootUser.Email: ${{ secrets.ROOT_EMAIL }} RootUser.Password: ${{ secrets.ROOT_PASSWORD }} 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 uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry @@ -123,6 +130,8 @@ jobs: - name: Pull new WatchIt.Website image run: docker pull ghcr.io/mateuszskoczek/watchit.website:latest - 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 - run: sleep 10 + run: sleep 10 \ No newline at end of file diff --git a/WatchIt.Database/WatchIt.Database.Model/WatchIt.Database.Model.Seeding/DataReader.cs b/WatchIt.Database/WatchIt.Database.Model/WatchIt.Database.Model.Seeding/DataReader.cs index b45cbbe..c71686b 100644 --- a/WatchIt.Database/WatchIt.Database.Model/WatchIt.Database.Model.Seeding/DataReader.cs +++ b/WatchIt.Database/WatchIt.Database.Model/WatchIt.Database.Model.Seeding/DataReader.cs @@ -11,8 +11,6 @@ public class DataReader public static IEnumerable Read(string filename) { 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); IEnumerable? data = JsonSerializer.Deserialize>(dataString); if (data is null)