Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.

Commit 70543f7

Browse files
skoc10skoc10
authored
Merge pull request #230 from abpframework/gterdem/image_build_script_update
Updated default image build scripts
2 parents a189aac + 4c744d6 commit 70543f7

File tree

5 files changed

+57
-64
lines changed

5 files changed

+57
-64
lines changed

‎build/build-images-locally.ps1

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
param ($version='1.0.0')
1+
param ($version='latest')
22

33
$currentFolder = $PSScriptRoot
44
$slnFolder = Join-Path $currentFolder "../"
@@ -17,7 +17,7 @@ $paymentServiceFolder = Join-Path $slnFolder "services/payment/src/EShopOnAbp.Pa
1717
$orderingServiceFolder = Join-Path $slnFolder "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host"
1818
$cmskitServiceFolder = Join-Path $slnFolder "services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host"
1919

20-
$total = 12
20+
$total = 11
2121

2222
### Angular WEB App(WWW)
2323
Write-Host "*** BUILDING WEB (WWW) 1/$total ****************" -ForegroundColor Green
@@ -28,61 +28,61 @@ npm run build:prod
2828
docker build -f Dockerfile.local -t eshoponabp/app-web:$version .
2929

3030
### PUBLIC-WEB
31-
Write-Host "*** BUILDING WEB-PUBLIC 3/$total ****************" -ForegroundColor Green
31+
Write-Host "*** BUILDING WEB-PUBLIC 2/$total ****************" -ForegroundColor Green
3232
Set-Location $publicWebFolder
3333
dotnet publish -c Release
3434
docker build -f Dockerfile.local -t eshoponabp/app-publicweb:$version .
3535

3636
### WEB-GATEWAY
37-
Write-Host "*** BUILDING WEB-GATEWAY 4/$total ****************" -ForegroundColor Green
37+
Write-Host "*** BUILDING WEB-GATEWAY 3/$total ****************" -ForegroundColor Green
3838
Set-Location $webGatewayFolder
3939
dotnet publish -c Release
4040
docker build -f Dockerfile.local -t eshoponabp/gateway-web:$version .
4141

4242
### PUBLICWEB-GATEWAY
43-
Write-Host "*** BUILDING WEB-PUBLIC-GATEWAY 5/$total ****************" -ForegroundColor Green
43+
Write-Host "*** BUILDING WEB-PUBLIC-GATEWAY 4/$total ****************" -ForegroundColor Green
4444
Set-Location $webPublicGatewayFolder
4545
dotnet publish -c Release
4646
docker build -f Dockerfile.local -t eshoponabp/gateway-web-public:$version .
4747

4848
### IDENTITY-SERVICE
49-
Write-Host "*** BUILDING IDENTITY-SERVICE 6/$total ****************" -ForegroundColor Green
49+
Write-Host "*** BUILDING IDENTITY-SERVICE 5/$total ****************" -ForegroundColor Green
5050
Set-Location $identityServiceFolder
5151
dotnet publish -c Release
5252
docker build -f Dockerfile.local -t eshoponabp/service-identity:$version .
5353

5454
### ADMINISTRATION-SERVICE
55-
Write-Host "*** BUILDING ADMINISTRATION-SERVICE 7/$total ****************" -ForegroundColor Green
55+
Write-Host "*** BUILDING ADMINISTRATION-SERVICE 6/$total ****************" -ForegroundColor Green
5656
Set-Location $administrationServiceFolder
5757
dotnet publish -c Release
5858
docker build -f Dockerfile.local -t eshoponabp/service-administration:$version .
5959

6060
### BASKET-SERVICE
61-
Write-Host "**************** BUILDING BASKET-SERVICE 8/$total ****************" -ForegroundColor Green
61+
Write-Host "**************** BUILDING BASKET-SERVICE 7/$total ****************" -ForegroundColor Green
6262
Set-Location $basketServiceFolder
6363
dotnet publish -c Release
6464
docker build -f Dockerfile.local -t eshoponabp/service-basket:$version .
6565

6666
### CATALOG-SERVICE
67-
Write-Host "**************** BUILDING CATALOG-SERVICE 9/$total ****************" -ForegroundColor Green
67+
Write-Host "**************** BUILDING CATALOG-SERVICE 8/$total ****************" -ForegroundColor Green
6868
Set-Location $catalogServiceFolder
6969
dotnet publish -c Release
7070
docker build -f Dockerfile.local -t eshoponabp/service-catalog:$version .
7171

7272
### PAYMENT-SERVICE
73-
Write-Host "**************** BUILDING PAYMENT-SERVICE 10/$total ****************" -ForegroundColor Green
73+
Write-Host "**************** BUILDING PAYMENT-SERVICE 9/$total ****************" -ForegroundColor Green
7474
Set-Location $paymentServiceFolder
7575
dotnet publish -c Release
7676
docker build -f Dockerfile.local -t eshoponabp/service-payment:$version .
7777

7878
### ORDERING-SERVICE
79-
Write-Host "**************** BUILDING ORDERING-SERVICE 11/$total ****************" -ForegroundColor Green
79+
Write-Host "**************** BUILDING ORDERING-SERVICE 10/$total ****************" -ForegroundColor Green
8080
Set-Location $orderingServiceFolder
8181
dotnet publish -c Release
8282
docker build -f Dockerfile.local -t eshoponabp/service-ordering:$version .
8383

8484
### CMSKIT-SERVICE
85-
Write-Host "**************** BUILDING CMSKIT-SERVICE 12/$total ****************" -ForegroundColor Green
85+
Write-Host "**************** BUILDING CMSKIT-SERVICE 11/$total ****************" -ForegroundColor Green
8686
Set-Location $cmskitServiceFolder
8787
dotnet publish -c Release
8888
docker build -f Dockerfile.local -t eshoponabp/service-cmskit:$version .

‎build/build-images-locally.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
export IMAGE_TAG="latest"
4-
export total=12
4+
export total=11
55
cd ../
66
export currentFolder=`pwd`
77
cd build/
@@ -15,60 +15,60 @@ npm run build:prod
1515
docker build -f Dockerfile.local --force-rm -t "eshoponabp/app-web:${IMAGE_TAG}" .
1616

1717

18-
echo "*** BUILDING WEB-PUBLIC 3/$total ****************"
18+
echo "*** BUILDING WEB-PUBLIC 2/$total ****************"
1919
cd ${currentFolder}/apps/public-web/src/EShopOnAbp.PublicWeb
2020
dotnet publish -c Release
2121
docker build -f Dockerfile.local --force-rm -t "eshoponabp/app-publicweb:${IMAGE_TAG}" .
2222

2323

24-
echo "*** BUILDING WEB-GATEWAY 4/$total ****************"
24+
echo "*** BUILDING WEB-GATEWAY 3/$total ****************"
2525
cd ${currentFolder}/gateways/web/src/EShopOnAbp.WebGateway
2626
dotnet publish -c Release
2727
docker build -f Dockerfile.local --force-rm -t "eshoponabp/gateway-web:${IMAGE_TAG}" .
2828

2929

30-
echo "*** BUILDING WEB-PUBLIC-GATEWAY 5/$total ****************"
30+
echo "*** BUILDING WEB-PUBLIC-GATEWAY 4/$total ****************"
3131
cd ${currentFolder}/gateways/web-public/src/EShopOnAbp.WebPublicGateway
3232
dotnet publish -c Release
3333
docker build -f Dockerfile.local --force-rm -t "eshoponabp/gateway-web-public:${IMAGE_TAG}" .
3434

3535

36-
echo "*** BUILDING IDENTITY-SERVICE 6/$total ****************"
36+
echo "*** BUILDING IDENTITY-SERVICE 5/$total ****************"
3737
cd ${currentFolder}/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host
3838
dotnet publish -c Release
3939
docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-identity:${IMAGE_TAG}" .
4040

4141

42-
echo "*** BUILDING ADMINISTRATION-SERVICE 7/$total ****************"
42+
echo "*** BUILDING ADMINISTRATION-SERVICE 6/$total ****************"
4343
cd ${currentFolder}/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host
4444
dotnet publish -c Release
4545
docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-administration:${IMAGE_TAG}" .
4646

4747

48-
echo "**************** BUILDING BASKET-SERVICE 8/$total ****************"
48+
echo "**************** BUILDING BASKET-SERVICE 7/$total ****************"
4949
cd ${currentFolder}/services/basket/src/EShopOnAbp.BasketService
5050
dotnet publish -c Release
5151
docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-basket:${IMAGE_TAG}" .
5252

5353

54-
echo "**************** BUILDING CATALOG-SERVICE 9/$total ****************"
54+
echo "**************** BUILDING CATALOG-SERVICE 8/$total ****************"
5555
cd ${currentFolder}/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host
5656
dotnet publish -c Release
5757
docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-catalog:${IMAGE_TAG}" .
5858

5959

60-
echo "**************** BUILDING PAYMENT-SERVICE 10/$total ****************"
60+
echo "**************** BUILDING PAYMENT-SERVICE 9/$total ****************"
6161
cd ${currentFolder}/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host
6262
dotnet publish -c Release
6363
docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-payment:${IMAGE_TAG}" .
6464

6565

66-
echo "**************** BUILDING ORDERING-SERVICE 11/$total ****************"
66+
echo "**************** BUILDING ORDERING-SERVICE 10/$total ****************"
6767
cd ${currentFolder}/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host
6868
dotnet publish -c Release
6969
docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-ordering:${IMAGE_TAG}" .
7070

71-
echo "**************** BUILDING CMSKIT-SERVICE 12/$total ****************"
71+
echo "**************** BUILDING CMSKIT-SERVICE 11/$total ****************"
7272
cd ${currentFolder}/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host
7373
dotnet publish -c Release
7474
docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-cmskit:${IMAGE_TAG}" .

‎build/build-images.ps1

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $paymentServiceFolder = Join-Path $slnFolder "services/payment/src/EShopOnAbp.Pa
1717
$orderingServiceFolder = Join-Path $slnFolder "services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host"
1818
$cmskitServiceFolder = Join-Path $slnFolder "services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host"
1919

20-
$total = 12
20+
$total = 11
2121

2222
Write-Host "===== BUILDING APPLICATIONS =====" -ForegroundColor Yellow
2323

@@ -27,56 +27,56 @@ Set-Location $webAppFolder
2727
docker build -f "$webAppFolder/Dockerfile" -t eshoponabp/app-web:$version .
2828

2929
### PUBLIC-WEB
30-
Write-Host "**************** BUILDING WEB-PUBLIC 3/$total ****************" -ForegroundColor Green
30+
Write-Host "**************** BUILDING WEB-PUBLIC 2/$total ****************" -ForegroundColor Green
3131
Set-Location $slnFolder
3232
docker build -f "$publicWebFolder/Dockerfile" -t eshoponabp/app-publicweb:$version .
3333

3434
Write-Host "===== BUILDING GATEWAYS =====" -ForegroundColor Yellow
3535

3636
### WEB-GATEWAY
37-
Write-Host "**************** BUILDING WEB-GATEWAY 4/$total ****************" -ForegroundColor Green
37+
Write-Host "**************** BUILDING WEB-GATEWAY 3/$total ****************" -ForegroundColor Green
3838
Set-Location $slnFolder
3939
docker build -f "$webGatewayFolder/Dockerfile" -t eshoponabp/gateway-web:$version .
4040

4141
### PUBLICWEB-GATEWAY
42-
Write-Host "**************** BUILDING WEB-PUBLIC-GATEWAY 5/$total ****************" -ForegroundColor Green
42+
Write-Host "**************** BUILDING WEB-PUBLIC-GATEWAY 4/$total ****************" -ForegroundColor Green
4343
Set-Location $slnFolder
4444
docker build -f "$webPublicGatewayFolder/Dockerfile" -t eshoponabp/gateway-web-public:$version .
4545

4646
Write-Host "===== BUILDING MICROSERVICES =====" -ForegroundColor Yellow
4747

4848
### IDENTITY-SERVICE
49-
Write-Host "**************** BUILDING IDENTITY-SERVICE 6/$total ****************" -ForegroundColor Green
49+
Write-Host "**************** BUILDING IDENTITY-SERVICE 5/$total ****************" -ForegroundColor Green
5050
Set-Location $slnFolder
5151
docker build -f "$identityServiceFolder/Dockerfile" -t eshoponabp/service-identity:$version .
5252

5353
### ADMINISTRATION-SERVICE
54-
Write-Host "**************** BUILDING ADMINISTRATION-SERVICE 7/$total ****************" -ForegroundColor Green
54+
Write-Host "**************** BUILDING ADMINISTRATION-SERVICE 6/$total ****************" -ForegroundColor Green
5555
Set-Location $slnFolder
5656
docker build -f "$administrationServiceFolder/Dockerfile" -t eshoponabp/service-administration:$version .
5757

5858
### BASKET-SERVICE
59-
Write-Host "**************** BUILDING BASKET-SERVICE 8/$total ****************" -ForegroundColor Green
59+
Write-Host "**************** BUILDING BASKET-SERVICE 7/$total ****************" -ForegroundColor Green
6060
Set-Location $slnFolder
6161
docker build -f "$basketServiceFolder/Dockerfile" -t eshoponabp/service-basket:$version .
6262

6363
### CATALOG-SERVICE
64-
Write-Host "**************** BUILDING CATALOG-SERVICE 9/$total ****************" -ForegroundColor Green
64+
Write-Host "**************** BUILDING CATALOG-SERVICE 8/$total ****************" -ForegroundColor Green
6565
Set-Location $slnFolder
6666
docker build -f "$catalogServiceFolder/Dockerfile" -t eshoponabp/service-catalog:$version .
6767

6868
### PAYMENT-SERVICE
69-
Write-Host "**************** BUILDING PAYMENT-SERVICE 10/$total ****************" -ForegroundColor Green
69+
Write-Host "**************** BUILDING PAYMENT-SERVICE 9/$total ****************" -ForegroundColor Green
7070
Set-Location $slnFolder
7171
docker build -f "$paymentServiceFolder/Dockerfile" -t eshoponabp/service-payment:$version .
7272

7373
### ORDERING-SERVICE
74-
Write-Host "**************** BUILDING ORDERING-SERVICE 11/$total ****************" -ForegroundColor Green
74+
Write-Host "**************** BUILDING ORDERING-SERVICE 10/$total ****************" -ForegroundColor Green
7575
Set-Location $slnFolder
7676
docker build -f "$orderingServiceFolder/Dockerfile" -t eshoponabp/service-ordering:$version .
7777

7878
### CMSKIT-SERVICE
79-
Write-Host "**************** BUILDING CMSKIT-SERVICE 12/$total ****************" -ForegroundColor Green
79+
Write-Host "**************** BUILDING CMSKIT-SERVICE 11/$total ****************" -ForegroundColor Green
8080
Set-Location $slnFolder
8181
docker build -f "$cmskitServiceFolder/Dockerfile" -t eshoponabp/service-cmskit:$version .
8282

‎build/build-images.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
export IMAGE_TAG="latest"
4-
export total=12
4+
export total=11
55
cd ../
66
export currentFolder=`pwd`
77
cd build/
@@ -11,51 +11,51 @@ cd ${currentFolder}/apps/angular
1111
docker build --force-rm -t "eshoponabp/app-web:${IMAGE_TAG}" .
1212

1313

14-
echo "*** BUILDING WEB-PUBLIC 3/$total ****************"
14+
echo "*** BUILDING WEB-PUBLIC 2/$total ****************"
1515
cd ${currentFolder}/apps/public-web/src/EShopOnAbp.PublicWeb
1616
docker build --force-rm -t "eshoponabp/app-publicweb:${IMAGE_TAG}" .
1717

1818

19-
echo "*** BUILDING WEB-GATEWAY 4/$total ****************"
19+
echo "*** BUILDING WEB-GATEWAY 3/$total ****************"
2020
cd ${currentFolder}/gateways/web/src/EShopOnAbp.WebGateway
2121
docker build --force-rm -t "eshoponabp/gateway-web:${IMAGE_TAG}" .
2222

2323

24-
echo "*** BUILDING WEB-PUBLIC-GATEWAY 5/$total ****************"
24+
echo "*** BUILDING WEB-PUBLIC-GATEWAY 4/$total ****************"
2525
cd ${currentFolder}/gateways/web-public/src/EShopOnAbp.WebPublicGateway
2626
docker build --force-rm -t "eshoponabp/gateway-web-public:${IMAGE_TAG}" .
2727

2828

29-
echo "*** BUILDING IDENTITY-SERVICE 6/$total ****************"
29+
echo "*** BUILDING IDENTITY-SERVICE 5/$total ****************"
3030
cd ${currentFolder}/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host
3131
docker build --force-rm -t "eshoponabp/service-identity:${IMAGE_TAG}" .
3232

3333

34-
echo "*** BUILDING ADMINISTRATION-SERVICE 7/$total ****************"
34+
echo "*** BUILDING ADMINISTRATION-SERVICE 6/$total ****************"
3535
cd ${currentFolder}/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host
3636
docker build --force-rm -t "eshoponabp/service-administration:${IMAGE_TAG}" .
3737

3838

39-
echo "**************** BUILDING BASKET-SERVICE 8/$total ****************"
39+
echo "**************** BUILDING BASKET-SERVICE 7/$total ****************"
4040
cd ${currentFolder}/services/basket/src/EShopOnAbp.BasketService
4141
docker build --force-rm -t "eshoponabp/service-basket:${IMAGE_TAG}" .
4242

4343

44-
echo "**************** BUILDING CATALOG-SERVICE 9/$total ****************"
44+
echo "**************** BUILDING CATALOG-SERVICE 8/$total ****************"
4545
cd ${currentFolder}/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host
4646
docker build --force-rm -t "eshoponabp/service-catalog:${IMAGE_TAG}" .
4747

4848

49-
echo "**************** BUILDING PAYMENT-SERVICE 10/$total ****************"
49+
echo "**************** BUILDING PAYMENT-SERVICE 9/$total ****************"
5050
cd ${currentFolder}/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host
5151
docker build --force-rm -t "eshoponabp/service-payment:${IMAGE_TAG}" .
5252

5353

54-
echo "**************** BUILDING ORDERING-SERVICE 11/$total ****************"
54+
echo "**************** BUILDING ORDERING-SERVICE 10/$total ****************"
5555
cd ${currentFolder}/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host
5656
docker build --force-rm -t "eshoponabp/service-ordering:${IMAGE_TAG}" .
5757

58-
echo "**************** BUILDING CMSKIT-SERVICE 12/$total ****************"
58+
echo "**************** BUILDING CMSKIT-SERVICE 11/$total ****************"
5959
cd ${currentFolder}/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host
6060
docker build --force-rm -t "eshoponabp/service-cmskit:${IMAGE_TAG}" .
6161

0 commit comments

Comments
 (0)