diff --git a/build-image-service-orders.ps1 b/build-image-service-orders.ps1 index 6212bd60e..3e2137f8f 100644 --- a/build-image-service-orders.ps1 +++ b/build-image-service-orders.ps1 @@ -3,14 +3,16 @@ Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow #*** Ordering service image *** -$orderingPathToJson = $scriptPath + "\src\Services\Ordering\Ordering.API\project.json" -Write-Host "orderingPathToJson is $orderingPathToJson" -ForegroundColor Yellow -$orderingPathToPub = $scriptPath + "\pub\ordering" -Write-Host "orderingPathToPub is $orderingPathToPub" -ForegroundColor Yellow +$orderingPath = $scriptPath + "\src\Services\Ordering" +Write-Host "orderingPath is $orderingPath" -ForegroundColor Yellow +$orderingApiPathToJson = $orderingPath + "\Ordering.API\project.json" +Write-Host "orderingApiPathToJson is $orderingApiPathToJson" -ForegroundColor Yellow +$orderingApiPathToPub = $scriptPath + "\pub\ordering" +Write-Host "orderingApiPathToPub is $orderingApiPathToPub" -ForegroundColor Yellow Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue -dotnet restore $orderingPathToJson -dotnet build $orderingPathToJson -dotnet publish $orderingPathToJson -o $orderingPathToPub +dotnet restore $orderingPath +dotnet build $orderingApiPathToJson +dotnet publish $orderingApiPathToJson -o $orderingApiPathToPub docker build -t eshop/ordering.api $orderingPathToPub \ No newline at end of file diff --git a/build-image-web-spa.ps1 b/build-image-web-spa.ps1 index e28757366..548a5aaed 100644 --- a/build-image-web-spa.ps1 +++ b/build-image-web-spa.ps1 @@ -42,15 +42,17 @@ dotnet build $catalogPathToJson dotnet publish $catalogPathToJson -o $catalogPathToPub #*** Ordering service image *** -$orderingPathToJson = $scriptPath + "\src\Services\Ordering\Ordering.API\project.json" -Write-Host "orderingPathToJson is $orderingPathToJson" -ForegroundColor Yellow -$orderingPathToPub = $scriptPath + "\pub\ordering" -Write-Host "orderingPathToPub is $orderingPathToPub" -ForegroundColor Yellow +$orderingPath = $scriptPath + "\src\Services\Ordering" +Write-Host "orderingPath is $orderingPath" -ForegroundColor Yellow +$orderingApiPathToJson = $orderingPath + "\Ordering.API\project.json" +Write-Host "orderingApiPathToJson is $orderingApiPathToJson" -ForegroundColor Yellow +$orderingApiPathToPub = $scriptPath + "\pub\ordering" +Write-Host "orderingApiPathToPub is $orderingApiPathToPub" -ForegroundColor Yellow Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue -dotnet restore $orderingPathToJson -dotnet build $orderingPathToJson -dotnet publish $orderingPathToJson -o $orderingPathToPub +dotnet restore $orderingPath +dotnet build $orderingApiPathToJson +dotnet publish $orderingApiPathToJson -o $orderingApiPathToPub #*** Basket service image *** $basketPathToJson = $scriptPath + "\src\Services\Basket\Basket.API\project.json" diff --git a/build-image-web.ps1 b/build-image-web.ps1 index 1a2b06fdb..ef3a94b12 100644 --- a/build-image-web.ps1 +++ b/build-image-web.ps1 @@ -40,15 +40,17 @@ dotnet build $catalogPathToJson dotnet publish $catalogPathToJson -o $catalogPathToPub #*** Ordering service image *** -$orderingPathToJson = $scriptPath + "\src\Services\Ordering\Ordering.API\project.json" -Write-Host "orderingPathToJson is $orderingPathToJson" -ForegroundColor Yellow -$orderingPathToPub = $scriptPath + "\pub\ordering" -Write-Host "orderingPathToPub is $orderingPathToPub" -ForegroundColor Yellow +$orderingPath = $scriptPath + "\src\Services\Ordering" +Write-Host "orderingPath is $orderingPath" -ForegroundColor Yellow +$orderingApiPathToJson = $orderingPath + "\Ordering.API\project.json" +Write-Host "orderingApiPathToJson is $orderingApiPathToJson" -ForegroundColor Yellow +$orderingApiPathToPub = $scriptPath + "\pub\ordering" +Write-Host "orderingApiPathToPub is $orderingApiPathToPub" -ForegroundColor Yellow Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue -dotnet restore $orderingPathToJson -dotnet build $orderingPathToJson -dotnet publish $orderingPathToJson -o $orderingPathToPub +dotnet restore $orderingPath +dotnet build $orderingApiPathToJson +dotnet publish $orderingApiPathToJson -o $orderingApiPathToPub #*** Basket service image *** $basketPathToJson = $scriptPath + "\src\Services\Basket\Basket.API\project.json" diff --git a/build-images.ps1 b/build-images.ps1 index d498bb89d..54d928bf2 100644 --- a/build-images.ps1 +++ b/build-images.ps1 @@ -40,7 +40,6 @@ dotnet restore $identitySvcPathToJson dotnet build $identitySvcPathToJson dotnet publish $identitySvcPathToJson -o $identitySvcPathToPub - #*** Catalog service image *** $catalogPathToJson = $scriptPath + "\src\Services\Catalog\Catalog.API\project.json" Write-Host "catalogPathToJson is $catalogPathToJson" -ForegroundColor Yellow @@ -53,15 +52,17 @@ dotnet build $catalogPathToJson dotnet publish $catalogPathToJson -o $catalogPathToPub #*** Ordering service image *** -$orderingPathToJson = $scriptPath + "\src\Services\Ordering\Ordering.API\project.json" -Write-Host "orderingPathToJson is $orderingPathToJson" -ForegroundColor Yellow -$orderingPathToPub = $scriptPath + "\pub\ordering" -Write-Host "orderingPathToPub is $orderingPathToPub" -ForegroundColor Yellow +$orderingPath = $scriptPath + "\src\Services\Ordering" +Write-Host "orderingPath is $orderingPath" -ForegroundColor Yellow +$orderingApiPathToJson = $orderingPath + "\Ordering.API\project.json" +Write-Host "orderingApiPathToJson is $orderingApiPathToJson" -ForegroundColor Yellow +$orderingApiPathToPub = $scriptPath + "\pub\ordering" +Write-Host "orderingApiPathToPub is $orderingApiPathToPub" -ForegroundColor Yellow Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue -dotnet restore $orderingPathToJson -dotnet build $orderingPathToJson -dotnet publish $orderingPathToJson -o $orderingPathToPub +dotnet restore $orderingPath +dotnet build $orderingApiPathToJson +dotnet publish $orderingApiPathToJson -o $orderingApiPathToPub #*** Basket service image *** $basketPathToJson = $scriptPath + "\src\Services\Basket\Basket.API\project.json" @@ -83,7 +84,7 @@ docker rmi $(docker images -q) #*** build docker images *** docker build -t eshop/web $webPathToPub docker build -t eshop/catalog.api $catalogPathToPub -docker build -t eshop/ordering.api $orderingPathToPub +docker build -t eshop/ordering.api $orderingApiPathToPub docker build -t eshop/basket.api $basketPathToPub docker build -t eshop/webspa $webSPAPathToPub docker build -t eshop/identity $identitySvcPathToPub \ No newline at end of file