ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issue with .NET 1.1 from image:latest and .NET 1.0.1 that we're currently using

Browse Source
This commit is contained in:
CESARDELATORRE 2016-11-30 15:01:14 -08:00
parent faaaf2a72d
commit 1182802816
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build-images.ps1
View File

@ -7,17 +7,19 @@ $pubFolderToDelete = $scriptPath + "\pub"
remove-item -path $pubFolderToDelete -Force -Recurse -ErrorAction SilentlyContinue remove-item -path $pubFolderToDelete -Force -Recurse -ErrorAction SilentlyContinue
#cmd /c "rd /s pub" /q #cmd /c "rd /s pub" /q
# *** WebMVC image *** # *** WebMVC image ***
$webPathToJson = $scriptPath + "\src\Web\WebMVC\project.json" $webPathToJson = $scriptPath + "\src\Web\WebMVC\project.json"
Write-Host "webPathToJson is $webPathToJson" -ForegroundColor Yellow Write-Host "webPathToJson is $webPathToJson" -ForegroundColor Yellow
$webPathToPub = $scriptPath + "\pub\webMVC" $webPathToPub = $scriptPath + "\pub\webMVC"
Write-Host "webPathToPub is $webPathToPub" -ForegroundColor Yellow Write-Host "webPathToPub is $webPathToPub" -ForegroundColor Yellow
Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue
dotnet restore $webPathToJson dotnet restore $webPathToJson
dotnet build $webPathToJson dotnet build $webPathToJson
dotnet publish $webPathToJson -o $webPathToPub dotnet publish $webPathToJson -o $webPathToPub
# *** WebSPA image *** # *** WebSPA image ***
$webSPAPathToJson = $scriptPath + "\src\Web\WebSPA\eShopOnContainers.WebSPA\project.json" $webSPAPathToJson = $scriptPath + "\src\Web\WebSPA\eShopOnContainers.WebSPA\project.json"
Write-Host "webSPAPathToJson is $webSPAPathToJson" -ForegroundColor Yellow Write-Host "webSPAPathToJson is $webSPAPathToJson" -ForegroundColor Yellow
@ -41,6 +43,7 @@ dotnet restore $catalogPathToJson
dotnet build $catalogPathToJson dotnet build $catalogPathToJson
dotnet publish $catalogPathToJson -o $catalogPathToPub dotnet publish $catalogPathToJson -o $catalogPathToPub
#*** Ordering service image *** #*** Ordering service image ***
$orderingPathToJson = $scriptPath + "\src\Services\Ordering\Ordering.API\project.json" $orderingPathToJson = $scriptPath + "\src\Services\Ordering\Ordering.API\project.json"
Write-Host "orderingPathToJson is $orderingPathToJson" -ForegroundColor Yellow Write-Host "orderingPathToJson is $orderingPathToJson" -ForegroundColor Yellow
@ -52,6 +55,7 @@ dotnet restore $orderingPathToJson
dotnet build $orderingPathToJson dotnet build $orderingPathToJson
dotnet publish $orderingPathToJson -o $orderingPathToPub dotnet publish $orderingPathToJson -o $orderingPathToPub
#*** Basket service image *** #*** Basket service image ***
$basketPathToJson = $scriptPath + "\src\Services\Basket\Basket.API\project.json" $basketPathToJson = $scriptPath + "\src\Services\Basket\Basket.API\project.json"
Write-Host "basketPathToJson is $basketPathToJson" -ForegroundColor Yellow Write-Host "basketPathToJson is $basketPathToJson" -ForegroundColor Yellow
@ -63,6 +67,8 @@ dotnet restore $basketPathToJson
dotnet build $basketPathToJson dotnet build $basketPathToJson
dotnet publish $basketPathToJson -o $basketPathToPub dotnet publish $basketPathToJson -o $basketPathToPub
#*** Build Docker Images
docker build -t eshop/web $webPathToPub docker build -t eshop/web $webPathToPub
docker build -t eshop/catalog.api $catalogPathToPub docker build -t eshop/catalog.api $catalogPathToPub
docker build -t eshop/ordering.api $orderingPathToPub docker build -t eshop/ordering.api $orderingPathToPub

2
src/Services/Catalog/Catalog.API/Dockerfile
View File

@ -1,4 +1,4 @@
FROM microsoft/aspnetcore:latest FROM microsoft/aspnetcore:1.0.1
WORKDIR /app WORKDIR /app
EXPOSE 80 EXPOSE 80
ADD . /app ADD . /app

4
src/Services/Catalog/Catalog.API/Startup.cs
View File

@ -52,9 +52,9 @@
options.DescribeAllEnumsAsStrings(); options.DescribeAllEnumsAsStrings();
options.SingleApiVersion(new Swashbuckle.Swagger.Model.Info() options.SingleApiVersion(new Swashbuckle.Swagger.Model.Info()
{ {
Title = "Catalog HTTP API", Title = "eShopOnContainers - Catalog HTTP API",
Version = "v1", Version = "v1",
Description = "The Catalog Service HTTP API", Description = "The Catalog Microservice HTTP API. This is a Data-Driven/CRUD microservice sample",
TermsOfService = "Terms Of Service" TermsOfService = "Terms Of Service"
}); });
}); });

5
src/Services/Catalog/Catalog.API/docker-compose.yml
View File

@ -2,10 +2,7 @@ version: '2'
services: services:
catalog.api: catalog.api:
image: eshop/catalog.api image: eshop/catalog.api
build:
context: .
dockerfile: Dockerfile
environment: environment:
- ConnectionString=Server=catalog.data;Initial Catalog=CatalogData;User Id=sa;Password=Pass@word - ConnectionString=Server=catalog.data;Initial Catalog=CatalogData;User Id=sa;Password=Pass@word
expose: expose: