From cedecba357c2e46d1ea22cb241ba5b2f746c329e Mon Sep 17 00:00:00 2001 From: Antoine Jourdain Date: Fri, 9 Feb 2024 19:23:52 +0100 Subject: [PATCH 1/7] Test CI --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index e5ed6f6..1f6a73c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -74,6 +74,7 @@ steps: CONTAINERNAME: api-in-english-please COMMAND: create OVERWRITE: true + CODEFIRST_CLIENTDRONE_ENV_BASE_PATH: /containers/antoinejourdain-api-in-english-please depends_on: [ docker-build-api ] when: branch: @@ -103,6 +104,7 @@ steps: CONTAINERNAME: in-english-please COMMAND: create OVERWRITE: true + CODEFIRST_CLIENTDRONE_ENV_BASE_PATH: /containers/antoinejourdain-in-english-please depends_on: [ docker-build-app ] when: branch: From e26be60eb5072ff4369c4c194f885e29534fd0d2 Mon Sep 17 00:00:00 2001 From: Antoine Jourdain Date: Fri, 9 Feb 2024 20:27:42 +0100 Subject: [PATCH 2/7] test ci --- .../adminBlazor/Services/DataApiService.cs | 14 +++++++------- Project/adminBlazor/adminBlazor/appsettings.json | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Project/adminBlazor/adminBlazor/Services/DataApiService.cs b/Project/adminBlazor/adminBlazor/Services/DataApiService.cs index d5921b7..a271aa6 100644 --- a/Project/adminBlazor/adminBlazor/Services/DataApiService.cs +++ b/Project/adminBlazor/adminBlazor/Services/DataApiService.cs @@ -24,24 +24,24 @@ namespace adminBlazor.Services var item = UserFactory.Create(model); // Save the data - await _http.PostAsJsonAsync("https://localhost:7234/api/User/", item); + await _http.PostAsJsonAsync("http://host.docker.internal:7234/api/User/", item); } public async Task Count() { - return await _http.GetFromJsonAsync("https://localhost:7234/api/User/count"); + return await _http.GetFromJsonAsync("http://host.docker.internal:7234/api/User/count"); } public async Task> List(int currentPage, int pageSize) { _logger.LogInformation("User API : call of method LIST."); - return await _http.GetFromJsonAsync>($"https://localhost:7234/api/User/?currentPage={currentPage}&pageSize={pageSize}"); + return await _http.GetFromJsonAsync>($"http://host.docker.internal:7234/api/User/?currentPage={currentPage}&pageSize={pageSize}"); } public async Task GetById(int id) { _logger.LogInformation("User API : call of method GetByID."); - return await _http.GetFromJsonAsync($"https://localhost:7234/api/User/{id}"); + return await _http.GetFromJsonAsync($"http://host.docker.internal:7234/api/User/{id}"); } public async Task Update(int id, UserModel model) @@ -51,18 +51,18 @@ namespace adminBlazor.Services _logger.LogInformation("User API : call of method UPDATE on User ID : {Id}.", id); - await _http.PutAsJsonAsync($"https://localhost:7234/api/User/{id}", item); + await _http.PutAsJsonAsync($"http://host.docker.internal:7234/api/User/{id}", item); } public async Task Delete(int id) { _logger.LogInformation("User API : call of method DELETE on User ID : {Id}.", id); - await _http.DeleteAsync($"https://localhost:7234/api/User/{id}"); + await _http.DeleteAsync($"http://host.docker.internal:7234/api/User/{id}"); } public async Task> GetRecipes() { - return await _http.GetFromJsonAsync>("https://localhost:7234/api/User/recipe"); + return await _http.GetFromJsonAsync>("http://host.docker.internal:7234/api/User/recipe"); } } } diff --git a/Project/adminBlazor/adminBlazor/appsettings.json b/Project/adminBlazor/adminBlazor/appsettings.json index 0a3b356..d5eb151 100644 --- a/Project/adminBlazor/adminBlazor/appsettings.json +++ b/Project/adminBlazor/adminBlazor/appsettings.json @@ -10,7 +10,8 @@ "Logging": { "LogLevel": { "Default": "Error", - "Microsoft": "Warning" + "Microsoft.AspNetCore": "Warning", + "Microsoft.AspNetCore.DataProtection": "None" }, "Debug": { "LogLevel": { From 0221c0da46a2ec188901b361fe46ed35e5ebbf34 Mon Sep 17 00:00:00 2001 From: Antoine Jourdain Date: Fri, 9 Feb 2024 20:32:16 +0100 Subject: [PATCH 3/7] Try fixing la CI --- .../adminBlazor/Properties/launchSettings.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Project/adminBlazor/adminBlazor/Properties/launchSettings.json b/Project/adminBlazor/adminBlazor/Properties/launchSettings.json index 968fc55..c800f94 100644 --- a/Project/adminBlazor/adminBlazor/Properties/launchSettings.json +++ b/Project/adminBlazor/adminBlazor/Properties/launchSettings.json @@ -1,14 +1,5 @@ { "profiles": { - "http": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:5138", - "dotnetRunMessages": true - }, "https": { "commandName": "Project", "launchBrowser": true, From 7fc82cf752402e9f101ee7703b61587d051b79dc Mon Sep 17 00:00:00 2001 From: Antoine Jourdain Date: Fri, 9 Feb 2024 20:39:38 +0100 Subject: [PATCH 4/7] Encore un test docker... --- .../adminBlazor/Properties/launchSettings.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Project/adminBlazor/adminBlazor/Properties/launchSettings.json b/Project/adminBlazor/adminBlazor/Properties/launchSettings.json index c800f94..6a039a2 100644 --- a/Project/adminBlazor/adminBlazor/Properties/launchSettings.json +++ b/Project/adminBlazor/adminBlazor/Properties/launchSettings.json @@ -9,6 +9,15 @@ "applicationUrl": "https://localhost:7054;http://localhost:5138", "dotnetRunMessages": true }, + "http": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:5138", + "dotnetRunMessages": true + }, "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, From 6163f7d4cfd8980b3dcf8ecbd99ef45bc69121fb Mon Sep 17 00:00:00 2001 From: Antoine Jourdain Date: Sat, 10 Feb 2024 17:58:02 +0100 Subject: [PATCH 5/7] test --- Project/adminBlazor/adminBlazor/appsettings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/Project/adminBlazor/adminBlazor/appsettings.json b/Project/adminBlazor/adminBlazor/appsettings.json index d5eb151..6c8acc2 100644 --- a/Project/adminBlazor/adminBlazor/appsettings.json +++ b/Project/adminBlazor/adminBlazor/appsettings.json @@ -1,4 +1,5 @@ { + "https_port": 443, "Creators": { "Name": [ "Patrick Brugière", From 6ca57fb022337d7abdf147fa657d6b59ad87ea59 Mon Sep 17 00:00:00 2001 From: Antoine Jourdain Date: Sat, 10 Feb 2024 18:02:58 +0100 Subject: [PATCH 6/7] Revert "Encore un test docker..." This reverts commit 7fc82cf752402e9f101ee7703b61587d051b79dc. --- .../adminBlazor/Properties/launchSettings.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Project/adminBlazor/adminBlazor/Properties/launchSettings.json b/Project/adminBlazor/adminBlazor/Properties/launchSettings.json index 6a039a2..c800f94 100644 --- a/Project/adminBlazor/adminBlazor/Properties/launchSettings.json +++ b/Project/adminBlazor/adminBlazor/Properties/launchSettings.json @@ -9,15 +9,6 @@ "applicationUrl": "https://localhost:7054;http://localhost:5138", "dotnetRunMessages": true }, - "http": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:5138", - "dotnetRunMessages": true - }, "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, From 78954ae3d3b021ec4703a2efb75d4a5e9bcb8b4e Mon Sep 17 00:00:00 2001 From: Antoine Jourdain Date: Sat, 10 Feb 2024 18:18:09 +0100 Subject: [PATCH 7/7] test encore --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1f6a73c..6d34d8c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -74,7 +74,7 @@ steps: CONTAINERNAME: api-in-english-please COMMAND: create OVERWRITE: true - CODEFIRST_CLIENTDRONE_ENV_BASE_PATH: /containers/antoinejourdain-api-in-english-please + CODEFIRST_CLIENTDRONE_ENV_BASE_PATH: /containers/antoinejourdain-api-in-english-please/ depends_on: [ docker-build-api ] when: branch: @@ -104,7 +104,7 @@ steps: CONTAINERNAME: in-english-please COMMAND: create OVERWRITE: true - CODEFIRST_CLIENTDRONE_ENV_BASE_PATH: /containers/antoinejourdain-in-english-please + CODEFIRST_CLIENTDRONE_ENV_BASE_PATH: /containers/antoinejourdain-in-english-please/ depends_on: [ docker-build-app ] when: branch: