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/ProductsApi/Dockerfile b/src/ProductsApi/Dockerfile index 3c48ac1..290e468 100644 --- a/src/ProductsApi/Dockerfile +++ b/src/ProductsApi/Dockerfile @@ -8,7 +8,8 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 -COPY project.json ./ +COPY ProductsApi.csproj ./ + 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/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/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/Dockerfile b/src/RecommandationsApi/Dockerfile index 3c48ac1..7e7cf1c 100644 --- a/src/RecommandationsApi/Dockerfile +++ b/src/RecommandationsApi/Dockerfile @@ -8,7 +8,7 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 -COPY project.json ./ +COPY RecommandationsApi.csproj ./ RUN ["dotnet", "restore"] COPY . /app 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/Dockerfile b/src/ShopFront/Dockerfile index 3c48ac1..4d6cfc8 100644 --- a/src/ShopFront/Dockerfile +++ b/src/ShopFront/Dockerfile @@ -8,7 +8,7 @@ EXPOSE 5000 ENV ASPNETCORE_URLS http://+:5000 -COPY project.json ./ +COPY ShopFront.csproj ./ RUN ["dotnet", "restore"] COPY . /app 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/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"; }
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" - } -} diff --git a/src/docker-compose.yml b/src/docker-compose.yml index aa90bad..aa855f4 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.azurecr.io/proxy:BuildNumber ports: ["80:80"] networks: - myshop products: - image: jcorioland-microsoft.azurecr.io/shop/products-api:BuildNumber + image: acsswarmacr.azurecr.io/productsapi:BuildNumber networks: - myshop ratings: - image: jcorioland-microsoft.azurecr.io/shop/ratings-api:BuildNumber + image: acsswarmacr.azurecr.io/ratingsapi:BuildNumber networks: - myshop recommandations: - image: jcorioland-microsoft.azurecr.io/shop/recommandations-api:BuildNumber + image: acsswarmacr.azurecr.io/recommendationsapi:BuildNumber networks: - myshop shop: - image: jcorioland-microsoft.azurecr.io/shop/front:BuildNumber + image: acsswarmacr.azurecr.io/shopfront: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://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