From f258ac3a2c40b76ba5835853d64ea3d0c2695067 Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sat, 6 May 2017 23:48:34 +0300 Subject: [PATCH 01/12] test commit --- .gitignore | 1 + src/ShopFront/Views/Home/Index.cshtml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c17401b..520f7e7 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ lib/ # Visual Studio 2015 cache/options directory .vs/ +.vscode/ # Uncomment if you have tasks that create the project's static files in wwwroot #wwwroot/ diff --git a/src/ShopFront/Views/Home/Index.cshtml b/src/ShopFront/Views/Home/Index.cshtml index 6cba251..ac18c0c 100644 --- a/src/ShopFront/Views/Home/Index.cshtml +++ b/src/ShopFront/Views/Home/Index.cshtml @@ -1,6 +1,6 @@ @inject Microsoft.Extensions.Options.IOptions settings @{ - ViewData["Title"] = "Welcome home"; + ViewData["Title"] = "Welcome home lala"; }
From 1da159d30218322ecf8e64eebe449daaa0bb62f0 Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sun, 7 May 2017 16:04:33 +0300 Subject: [PATCH 02/12] debug --- src/ProductsApi/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProductsApi/Dockerfile b/src/ProductsApi/Dockerfile index 3c48ac1..f2f4f74 100644 --- a/src/ProductsApi/Dockerfile +++ b/src/ProductsApi/Dockerfile @@ -9,6 +9,7 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 COPY project.json ./ +RUN ["ls"] RUN ["dotnet", "restore"] COPY . /app From ee59985f99bbd35257ffc7855505ae3cb85419ee Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sun, 7 May 2017 16:13:04 +0300 Subject: [PATCH 03/12] test --- src/ProductsApi/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProductsApi/Dockerfile b/src/ProductsApi/Dockerfile index f2f4f74..de874be 100644 --- a/src/ProductsApi/Dockerfile +++ b/src/ProductsApi/Dockerfile @@ -10,6 +10,7 @@ ENV ASPNETCORE_URLS http://+:5000 COPY project.json ./ RUN ["ls"] +RUN ["pwd"] RUN ["dotnet", "restore"] COPY . /app From b51153d2ec340447422d855d2d4bcdd3270313aa Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sun, 7 May 2017 16:17:12 +0300 Subject: [PATCH 04/12] dotnet migrate --- src/ProductsApi/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProductsApi/Dockerfile b/src/ProductsApi/Dockerfile index de874be..1f99278 100644 --- a/src/ProductsApi/Dockerfile +++ b/src/ProductsApi/Dockerfile @@ -9,8 +9,8 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 COPY project.json ./ -RUN ["ls"] -RUN ["pwd"] + +RUN ["dotnet", "migrate"] RUN ["dotnet", "restore"] COPY . /app From 8d8a3229bd04f06a15b4af37082263f6787a2c42 Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sun, 7 May 2017 16:23:35 +0300 Subject: [PATCH 05/12] dotnet migrate v2 --- src/ProductsApi/Dockerfile | 1 - src/ProductsApi/ProductsApi.csproj | 34 +++++++++ src/ProductsApi/project.json | 62 ---------------- src/RatingsApi/RatingsApi.csproj | 34 +++++++++ src/RatingsApi/project.json | 62 ---------------- .../RecommandationsApi.csproj | 34 +++++++++ src/RecommandationsApi/project.json | 62 ---------------- src/ShopFront/ShopFront.csproj | 47 ++++++++++++ src/ShopFront/project.json | 71 ------------------- 9 files changed, 149 insertions(+), 258 deletions(-) create mode 100644 src/ProductsApi/ProductsApi.csproj delete mode 100644 src/ProductsApi/project.json create mode 100644 src/RatingsApi/RatingsApi.csproj delete mode 100644 src/RatingsApi/project.json create mode 100644 src/RecommandationsApi/RecommandationsApi.csproj delete mode 100644 src/RecommandationsApi/project.json create mode 100644 src/ShopFront/ShopFront.csproj delete mode 100644 src/ShopFront/project.json diff --git a/src/ProductsApi/Dockerfile b/src/ProductsApi/Dockerfile index 1f99278..cd1af2b 100644 --- a/src/ProductsApi/Dockerfile +++ b/src/ProductsApi/Dockerfile @@ -10,7 +10,6 @@ ENV ASPNETCORE_URLS http://+:5000 COPY project.json ./ -RUN ["dotnet", "migrate"] RUN ["dotnet", "restore"] COPY . /app diff --git a/src/ProductsApi/ProductsApi.csproj b/src/ProductsApi/ProductsApi.csproj new file mode 100644 index 0000000..f7aceeb --- /dev/null +++ b/src/ProductsApi/ProductsApi.csproj @@ -0,0 +1,34 @@ + + + + netcoreapp1.0 + true + ProductsApi + Exe + ProductsApi + 1.0.4 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + diff --git a/src/ProductsApi/project.json b/src/ProductsApi/project.json deleted file mode 100644 index a84bafa..0000000 --- a/src/ProductsApi/project.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Mvc": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", - "Microsoft.AspNetCore.Cors":"1.0.0" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "Areas/**/Views", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "ProductsApi" - } -} diff --git a/src/RatingsApi/RatingsApi.csproj b/src/RatingsApi/RatingsApi.csproj new file mode 100644 index 0000000..bbfd6f1 --- /dev/null +++ b/src/RatingsApi/RatingsApi.csproj @@ -0,0 +1,34 @@ + + + + netcoreapp1.0 + true + RatingsApi + Exe + RatingsApi + 1.0.4 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + diff --git a/src/RatingsApi/project.json b/src/RatingsApi/project.json deleted file mode 100644 index b14bb45..0000000 --- a/src/RatingsApi/project.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Mvc": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", - "Microsoft.AspNetCore.Cors":"1.0.0" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "Areas/**/Views", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "RatingsApi" - } -} diff --git a/src/RecommandationsApi/RecommandationsApi.csproj b/src/RecommandationsApi/RecommandationsApi.csproj new file mode 100644 index 0000000..640eddd --- /dev/null +++ b/src/RecommandationsApi/RecommandationsApi.csproj @@ -0,0 +1,34 @@ + + + + netcoreapp1.0 + true + RecommandationsApi + Exe + RecommandationsApi + 1.0.4 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + diff --git a/src/RecommandationsApi/project.json b/src/RecommandationsApi/project.json deleted file mode 100644 index a5c11e1..0000000 --- a/src/RecommandationsApi/project.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Mvc": "1.0.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", - "Microsoft.AspNetCore.Cors":"1.0.0" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "Areas/**/Views", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "RecommandationsApi" - } -} diff --git a/src/ShopFront/ShopFront.csproj b/src/ShopFront/ShopFront.csproj new file mode 100644 index 0000000..393017f --- /dev/null +++ b/src/ShopFront/ShopFront.csproj @@ -0,0 +1,47 @@ + + + + netcoreapp1.0 + true + ShopFront + Exe + ShopFront + 1.0.4 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ShopFront/project.json b/src/ShopFront/project.json deleted file mode 100644 index 0a4aea9..0000000 --- a/src/ShopFront/project.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", - "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0" - }, - - "tools": { - "BundlerMinifier.Core": "2.0.238", - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "Areas/**/Views", - "appsettings.json", - "web.config" - ] - }, - - "scripts": { - "precompile": [ "dotnet bundle" ], - "prepublish": [ "bower install" ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "ShopFront" - } -} From 162a0d68784495ec7b98ea3c615b0223720a3e51 Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sun, 7 May 2017 16:27:18 +0300 Subject: [PATCH 06/12] dockerfile changes --- src/ProductsApi/Dockerfile | 2 +- src/RatingsApi/Dockerfile | 2 +- src/RecommandationsApi/Dockerfile | 2 +- src/ShopFront/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ProductsApi/Dockerfile b/src/ProductsApi/Dockerfile index cd1af2b..290e468 100644 --- a/src/ProductsApi/Dockerfile +++ b/src/ProductsApi/Dockerfile @@ -8,7 +8,7 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 -COPY project.json ./ +COPY ProductsApi.csproj ./ RUN ["dotnet", "restore"] diff --git a/src/RatingsApi/Dockerfile b/src/RatingsApi/Dockerfile index 3c48ac1..943fbe8 100644 --- a/src/RatingsApi/Dockerfile +++ b/src/RatingsApi/Dockerfile @@ -8,7 +8,7 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 -COPY project.json ./ +COPY RatingsApi.csproj ./ RUN ["dotnet", "restore"] COPY . /app diff --git a/src/RecommandationsApi/Dockerfile b/src/RecommandationsApi/Dockerfile index 3c48ac1..1e5fd1c 100644 --- a/src/RecommandationsApi/Dockerfile +++ b/src/RecommandationsApi/Dockerfile @@ -8,7 +8,7 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 -COPY project.json ./ +COPY RecommendationsApi.csproj ./ RUN ["dotnet", "restore"] COPY . /app diff --git a/src/ShopFront/Dockerfile b/src/ShopFront/Dockerfile index 3c48ac1..62944b7 100644 --- a/src/ShopFront/Dockerfile +++ b/src/ShopFront/Dockerfile @@ -8,7 +8,7 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 -COPY project.json ./ +COPY MyShop.csproj ./ RUN ["dotnet", "restore"] COPY . /app From 369346426c58c2a73b9ab6dbc93471f28c2bc125 Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sun, 7 May 2017 16:36:31 +0300 Subject: [PATCH 07/12] changes --- src/RecommandationsApi/Dockerfile | 2 +- src/docker-compose.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/RecommandationsApi/Dockerfile b/src/RecommandationsApi/Dockerfile index 1e5fd1c..7e7cf1c 100644 --- a/src/RecommandationsApi/Dockerfile +++ b/src/RecommandationsApi/Dockerfile @@ -8,7 +8,7 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 -COPY RecommendationsApi.csproj ./ +COPY RecommandationsApi.csproj ./ RUN ["dotnet", "restore"] COPY . /app diff --git a/src/docker-compose.yml b/src/docker-compose.yml index aa90bad..a249694 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -4,27 +4,27 @@ networks: driver: overlay services: proxy: - image: jcorioland-microsoft.azurecr.io/shop/nginx-proxy:latest + image: acsswarmacr.io/shop/nginx-proxy:latest ports: ["80:80"] networks: - myshop products: - image: jcorioland-microsoft.azurecr.io/shop/products-api:BuildNumber + image: acsswarmacr.azurecr.io/shop/products-api:BuildNumber networks: - myshop ratings: - image: jcorioland-microsoft.azurecr.io/shop/ratings-api:BuildNumber + image: acsswarmacr.azurecr.io/shop/ratings-api:BuildNumber networks: - myshop recommandations: - image: jcorioland-microsoft.azurecr.io/shop/recommandations-api:BuildNumber + image: acsswarmacr.azurecr.io/shop/recommandations-api:BuildNumber networks: - myshop shop: - image: jcorioland-microsoft.azurecr.io/shop/front:BuildNumber + image: acsswarmacr.azurecr.io/shop/front:BuildNumber networks: - myshop environment: - - SHOP_PRODUCTS_API_URL=http://acsmyshop-agents.westeurope.cloudapp.azure.com/products/ - - SHOP_RATINGS_API_URL=http://acsmyshop-agents.westeurope.cloudapp.azure.com/ratings/ - - SHOP_RECOMMANDATIONS_API_URL=http://acsmyshop-agents.westeurope.cloudapp.azure.com/recommandations/ \ No newline at end of file + - SHOP_PRODUCTS_API_URL=http://acsswarm-agents.westeurope.cloudapp.azure.com/products/ + - SHOP_RATINGS_API_URL=http://acsswarm-agents.westeurope.cloudapp.azure.com/ratings/ + - SHOP_RECOMMANDATIONS_API_URL=http://acsswarm-agents.westeurope.cloudapp.azure.com/recommandations/ \ No newline at end of file From 0bd8e88d1380735c3bbcffb3bf3804b8fe295fc8 Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sun, 7 May 2017 16:40:48 +0300 Subject: [PATCH 08/12] changes --- src/ShopFront/Dockerfile | 2 +- src/docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ShopFront/Dockerfile b/src/ShopFront/Dockerfile index 62944b7..4d6cfc8 100644 --- a/src/ShopFront/Dockerfile +++ b/src/ShopFront/Dockerfile @@ -8,7 +8,7 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 -COPY MyShop.csproj ./ +COPY ShopFront.csproj ./ RUN ["dotnet", "restore"] COPY . /app diff --git a/src/docker-compose.yml b/src/docker-compose.yml index a249694..b19fd6f 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -25,6 +25,6 @@ services: networks: - myshop environment: - - SHOP_PRODUCTS_API_URL=http://acsswarm-agents.westeurope.cloudapp.azure.com/products/ - - SHOP_RATINGS_API_URL=http://acsswarm-agents.westeurope.cloudapp.azure.com/ratings/ - - SHOP_RECOMMANDATIONS_API_URL=http://acsswarm-agents.westeurope.cloudapp.azure.com/recommandations/ \ No newline at end of file + - SHOP_PRODUCTS_API_URL=http://gkanatsiosacsswarmagents.westeurope.cloudapp.azure.com.westeurope.cloudapp.azure.com/products/ + - SHOP_RATINGS_API_URL=http://gkanatsiosacsswarmagents.westeurope.cloudapp.azure.com.westeurope.cloudapp.azure.com/ratings/ + - SHOP_RECOMMANDATIONS_API_URL=http://gkanatsiosacsswarmagents.westeurope.cloudapp.azure.com.westeurope.cloudapp.azure.com/recommandations/ \ No newline at end of file From 6aa5d6d9cabd7ec37538ac5982ed97a76e1a4b7f Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sun, 7 May 2017 16:47:59 +0300 Subject: [PATCH 09/12] index.html change --- src/ShopFront/Views/Home/Index.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ShopFront/Views/Home/Index.cshtml b/src/ShopFront/Views/Home/Index.cshtml index ac18c0c..6cba251 100644 --- a/src/ShopFront/Views/Home/Index.cshtml +++ b/src/ShopFront/Views/Home/Index.cshtml @@ -1,6 +1,6 @@ @inject Microsoft.Extensions.Options.IOptions settings @{ - ViewData["Title"] = "Welcome home lala"; + ViewData["Title"] = "Welcome home"; }
From bdc3443656b5cc5173bb068e8e014da30bb99b65 Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sun, 7 May 2017 17:25:26 +0300 Subject: [PATCH 10/12] docker-compose --- src/docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/docker-compose.yml b/src/docker-compose.yml index b19fd6f..8ce6ce8 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -4,24 +4,24 @@ networks: driver: overlay services: proxy: - image: acsswarmacr.io/shop/nginx-proxy:latest + image: acsswarmacr.io/proxy:latest ports: ["80:80"] networks: - myshop products: - image: acsswarmacr.azurecr.io/shop/products-api:BuildNumber + image: acsswarmacr.azurecr.io/productsapi:BuildNumber networks: - myshop ratings: - image: acsswarmacr.azurecr.io/shop/ratings-api:BuildNumber + image: acsswarmacr.azurecr.io/ratingsapi:BuildNumber networks: - myshop recommandations: - image: acsswarmacr.azurecr.io/shop/recommandations-api:BuildNumber + image: acsswarmacr.azurecr.io/recommendationsapi:BuildNumber networks: - myshop shop: - image: acsswarmacr.azurecr.io/shop/front:BuildNumber + image: acsswarmacr.azurecr.io/shopfront:BuildNumber networks: - myshop environment: From df97c43b871bd5f7351d156c0a14e085eb6a256a Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Sun, 7 May 2017 18:16:30 +0300 Subject: [PATCH 11/12] fixes --- src/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 8ce6ce8..aa855f4 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -4,7 +4,7 @@ networks: driver: overlay services: proxy: - image: acsswarmacr.io/proxy:latest + image: acsswarmacr.azurecr.io/proxy:BuildNumber ports: ["80:80"] networks: - myshop @@ -25,6 +25,6 @@ services: networks: - myshop environment: - - SHOP_PRODUCTS_API_URL=http://gkanatsiosacsswarmagents.westeurope.cloudapp.azure.com.westeurope.cloudapp.azure.com/products/ - - SHOP_RATINGS_API_URL=http://gkanatsiosacsswarmagents.westeurope.cloudapp.azure.com.westeurope.cloudapp.azure.com/ratings/ - - SHOP_RECOMMANDATIONS_API_URL=http://gkanatsiosacsswarmagents.westeurope.cloudapp.azure.com.westeurope.cloudapp.azure.com/recommandations/ \ No newline at end of file + - SHOP_PRODUCTS_API_URL=http://gkanatsiosacsswarmagents.westeurope.cloudapp.azure.com/products/ + - SHOP_RATINGS_API_URL=http://gkanatsiosacsswarmagents.westeurope.cloudapp.azure.com/ratings/ + - SHOP_RECOMMANDATIONS_API_URL=http://gkanatsiosacsswarmagents.westeurope.cloudapp.azure.com/recommandations/ \ No newline at end of file From beb239c7a127ca6d09d1900ba06379688784645c Mon Sep 17 00:00:00 2001 From: Dimitris-Ilias Gkanatsios Date: Thu, 11 May 2017 13:57:23 +0300 Subject: [PATCH 12/12] lala --- src/ShopFront/Views/Home/Index.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ShopFront/Views/Home/Index.cshtml b/src/ShopFront/Views/Home/Index.cshtml index 6cba251..53541d2 100644 --- a/src/ShopFront/Views/Home/Index.cshtml +++ b/src/ShopFront/Views/Home/Index.cshtml @@ -1,6 +1,6 @@ @inject Microsoft.Extensions.Options.IOptions settings @{ - ViewData["Title"] = "Welcome home"; + ViewData["Title"] = "Welcome home Dimitris"; }