From bbf934d67eb4808c49061eab3ab05624325d82ea Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Mon, 8 Nov 2021 19:13:09 +0300
Subject: [PATCH] fixed gateway image build error

---
 build/build-images.ps1                        | 44 +++++++++----------
 .../EShopOnAbp.WebPublicGateway/Dockerfile    |  2 +-
 .../web/src/EShopOnAbp.WebGateway/Dockerfile  |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/build/build-images.ps1 b/build/build-images.ps1
index 89117fb2..2fdb47e1 100644
--- a/build/build-images.ps1
+++ b/build/build-images.ps1
@@ -20,17 +20,17 @@ Write-Host "===== BUILDING APPLICATIONS =====" -ForegroundColor Yellow
 # Set-Location $slnFolder
 # docker build -f "$webAppFolder/Dockerfile" -t eshoponabp/app-web:$version .
 
-### AUTH-SERVER
-Write-Host "**************** BUILDING AUTH-SERVER ****************" -ForegroundColor Green
-Set-Location $slnFolder
-docker build -f "$authserverFolder/Dockerfile" -t eshoponabp/app-authserver:$version .
+# ### AUTH-SERVER
+# Write-Host "**************** BUILDING AUTH-SERVER ****************" -ForegroundColor Green
+# Set-Location $slnFolder
+# docker build -f "$authserverFolder/Dockerfile" -t eshoponabp/app-authserver:$version .
 
-### PUBLIC-WEB
-Write-Host "**************** BUILDING WEB-PUBLIC ****************" -ForegroundColor Green
-Set-Location $slnFolder
-docker build -f "$publicWebFolder/Dockerfile" -t eshoponabp/app-publicweb:$version .
+# ### PUBLIC-WEB
+# Write-Host "**************** BUILDING WEB-PUBLIC ****************" -ForegroundColor Green
+# Set-Location $slnFolder
+# docker build -f "$publicWebFolder/Dockerfile" -t eshoponabp/app-publicweb:$version .
 
-Write-Host "===== BUILDING GATEWAYS =====" -ForegroundColor Yellow 
+# Write-Host "===== BUILDING GATEWAYS =====" -ForegroundColor Yellow 
 
 ### WEB-GATEWAY
 Write-Host "**************** BUILDING WEB-GATEWAY ****************" -ForegroundColor Green
@@ -39,25 +39,25 @@ docker build -f "$webGatewayFolder/Dockerfile" -t eshoponabp/gateway-web:$versio
 
 ### PUBLICWEB-GATEWAY
 Write-Host "**************** BUILDING WEB-PUBLIC-GATEWAY ****************" -ForegroundColor Green
-Set-Location $webPublicGatewayFolder
+Set-Location $slnFolder
 docker build -f "$webPublicGatewayFolder/Dockerfile" -t eshoponabp/gateway-web-public:$version .
 
 Write-Host "===== BUILDING MICROSERVICES =====" -ForegroundColor Yellow
 
-### IDENTITY-SERVICE
-Write-Host "**************** BUILDING IDENTITY-SERVICE ****************" -ForegroundColor Green
-Set-Location $slnFolder
-docker build -f "$identityServiceFolder/Dockerfile" -t eshoponabp/service-identity:$version .
+# ### IDENTITY-SERVICE
+# Write-Host "**************** BUILDING IDENTITY-SERVICE ****************" -ForegroundColor Green
+# Set-Location $slnFolder
+# docker build -f "$identityServiceFolder/Dockerfile" -t eshoponabp/service-identity:$version .
 
-### ADMINISTRATION-SERVICE
-Write-Host "**************** BUILDING ADMINISTRATION-SERVICE ****************" -ForegroundColor Green
-Set-Location $slnFolder
-docker build -f "$administrationServiceFolder/Dockerfile" -t eshoponabp/service-administration:$version .
+# ### ADMINISTRATION-SERVICE
+# Write-Host "**************** BUILDING ADMINISTRATION-SERVICE ****************" -ForegroundColor Green
+# Set-Location $slnFolder
+# docker build -f "$administrationServiceFolder/Dockerfile" -t eshoponabp/service-administration:$version .
 
-### SAAS-SERVICE
-Write-Host "**************** BUILDING SAAS-SERVICE ****************" -ForegroundColor Green
-Set-Location $slnFolder
-docker build -f "$saasServiceFolder/Dockerfile" -t eshoponabp/service-saas:$version .
+# ### SAAS-SERVICE
+# Write-Host "**************** BUILDING SAAS-SERVICE ****************" -ForegroundColor Green
+# Set-Location $slnFolder
+# docker build -f "$saasServiceFolder/Dockerfile" -t eshoponabp/service-saas:$version .
 
 ### ALL COMPLETED
 Write-Host "ALL COMPLETED" -ForegroundColor Green
diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile
index becc090b..ea373981 100644
--- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile
+++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile
@@ -39,7 +39,7 @@ COPY "NuGet.Config" "NuGet.Config"
 RUN dotnet restore "EShopOnAbp.sln"
 COPY . .
 
-WORKDIR "/src/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbp.WebPublicGateway"
+WORKDIR "/src/gateways/web-public/src/EShopOnAbp.WebPublicGateway"
 RUN dotnet publish -c Release -o /app 
 # Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app 
diff --git a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile
index d217b262..9ad062f6 100644
--- a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile
+++ b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile
@@ -39,7 +39,7 @@ COPY "NuGet.Config" "NuGet.Config"
 RUN dotnet restore "EShopOnAbp.sln"
 COPY . .
 
-WORKDIR "/src/gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbp.WebGateway"
+WORKDIR "/src/gateways/web/src/EShopOnAbp.WebGateway"
 RUN dotnet publish -c Release -o /app 
 # Should be used after .net6 is out of preview for better performance
 # RUN dotnet publish --no-restore -c Release -o /app