diff --git a/build/build-images-locally.ps1 b/build/build-images-locally.ps1 index a7075bad..82fde285 100644 --- a/build/build-images-locally.ps1 +++ b/build/build-images-locally.ps1 @@ -1,4 +1,4 @@ -param ($version='latest') +param ($version='1.0.0') $currentFolder = $PSScriptRoot $slnFolder = Join-Path $currentFolder "../" diff --git a/build/build-images-locally.sh b/build/build-images-locally.sh index 448a81ac..85237331 100755 --- a/build/build-images-locally.sh +++ b/build/build-images-locally.sh @@ -1,11 +1,14 @@ #!/bin/bash -export IMAGE_TAG="latest" +export IMAGE_TAG="1.0.0" export total=11 +cd ../ +export currentFolder=`pwd` +cd build/ echo "*** BUILDING WEB (WWW) 1/${total} ****************" -cd ../apps/angular +cd ${currentFolder}/apps/angular yarn # ng build --prod npm run build:prod @@ -13,61 +16,61 @@ docker build -f Dockerfile.local --force-rm -t "eshoponabp/app-web:${IMAGE_TAG}" echo "*** BUILDING AUTH-SERVER 2/$total ****************" -cd ../auth-server/src/EShopOnAbp.AuthServer +cd ${currentFolder}/apps/auth-server/src/EShopOnAbp.AuthServer dotnet publish -c Release docker build -f Dockerfile.local --force-rm -t "eshoponabp/app-authserver:${IMAGE_TAG}" . echo "*** BUILDING WEB-PUBLIC 3/$total ****************" -cd ../../../public-web/src/EShopOnAbp.PublicWeb +cd ${currentFolder}/apps/public-web/src/EShopOnAbp.PublicWeb dotnet publish -c Release docker build -f Dockerfile.local --force-rm -t "eshoponabp/app-publicweb:${IMAGE_TAG}" . echo "*** BUILDING WEB-GATEWAY 4/$total ****************" -cd ../../../../gateways/web/src/EShopOnAbp.WebGateway +cd ${currentFolder}/gateways/web/src/EShopOnAbp.WebGateway dotnet publish -c Release docker build -f Dockerfile.local --force-rm -t "eshoponabp/gateway-web:${IMAGE_TAG}" . echo "*** BUILDING WEB-PUBLIC-GATEWAY 5/$total ****************" -cd ../../../web-public/src/EShopOnAbp.WebPublicGateway +cd ${currentFolder}/gateways/web-public/src/EShopOnAbp.WebPublicGateway dotnet publish -c Release docker build -f Dockerfile.local --force-rm -t "eshoponabp/gateway-web-public:${IMAGE_TAG}" . echo "*** BUILDING IDENTITY-SERVICE 6/$total ****************" -cd ../../../../services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host +cd ${currentFolder}/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host dotnet publish -c Release docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-identity:${IMAGE_TAG}" . echo "*** BUILDING ADMINISTRATION-SERVICE 7/$total ****************" -cd ../../../administration/src/EShopOnAbp.AdministrationService.HttpApi.Host +cd ${currentFolder}/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host dotnet publish -c Release docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-administration:${IMAGE_TAG}" . echo "**************** BUILDING BASKET-SERVICE 8/$total ****************" -cd ../../../basket/src/EShopOnAbp.BasketService +cd ${currentFolder}/services/basket/src/EShopOnAbp.BasketService dotnet publish -c Release docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-basket:${IMAGE_TAG}" . echo "**************** BUILDING CATALOG-SERVICE 9/$total ****************" -cd ../../../catalog/src/EShopOnAbp.CatalogService.HttpApi.Host +cd ${currentFolder}/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host dotnet publish -c Release docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-catalog:${IMAGE_TAG}" . echo "**************** BUILDING PAYMENT-SERVICE 10/$total ****************" -cd ../../../payment/src/EShopOnAbp.PaymentService.HttpApi.Host +cd ${currentFolder}/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host dotnet publish -c Release docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-payment:${IMAGE_TAG}" . echo "**************** BUILDING ORDERING-SERVICE 11/$total ****************" -cd ../../../ordering/src/EShopOnAbp.OrderingService.HttpApi.Host +cd ${currentFolder}/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host dotnet publish -c Release docker build -f Dockerfile.local --force-rm -t "eshoponabp/service-ordering:${IMAGE_TAG}" . diff --git a/build/build-images.ps1 b/build/build-images.ps1 index 4cf1ecf6..eef11c86 100644 --- a/build/build-images.ps1 +++ b/build/build-images.ps1 @@ -1,4 +1,4 @@ -param ($version='latest') +param ($version='1.0.0') $currentFolder = $PSScriptRoot $slnFolder = Join-Path $currentFolder "../" diff --git a/build/build-images.sh b/build/build-images.sh index 7c060614..79b96680 100755 --- a/build/build-images.sh +++ b/build/build-images.sh @@ -1,61 +1,63 @@ #!/bin/bash -export IMAGE_TAG="latest" +export IMAGE_TAG="1.0.0" export total=11 -#export currentFolder=`pwd` +cd ../ +export currentFolder=`pwd` +cd build/ echo "*** BUILDING WEB (WWW) 1/${total} ****************" -cd ../apps/angular +cd ${currentFolder}/apps/angular docker build --force-rm -t "eshoponabp/app-web:${IMAGE_TAG}" . echo "*** BUILDING AUTH-SERVER 2/$total ****************" -cd ../auth-server/src/EShopOnAbp.AuthServer +cd ${currentFolder}/apps/auth-server/src/EShopOnAbp.AuthServer docker build --force-rm -t "eshoponabp/app-authserver:${IMAGE_TAG}" . echo "*** BUILDING WEB-PUBLIC 3/$total ****************" -cd ../../../public-web/src/EShopOnAbp.PublicWeb +cd ${currentFolder}/apps/public-web/src/EShopOnAbp.PublicWeb docker build --force-rm -t "eshoponabp/app-publicweb:${IMAGE_TAG}" . echo "*** BUILDING WEB-GATEWAY 4/$total ****************" -cd ../../../../gateways/web/src/EShopOnAbp.WebGateway +cd ${currentFolder}/gateways/web/src/EShopOnAbp.WebGateway docker build --force-rm -t "eshoponabp/gateway-web:${IMAGE_TAG}" . echo "*** BUILDING WEB-PUBLIC-GATEWAY 5/$total ****************" -cd ../../../web-public/src/EShopOnAbp.WebPublicGateway +cd ${currentFolder}/gateways/web-public/src/EShopOnAbp.WebPublicGateway docker build --force-rm -t "eshoponabp/gateway-web-public:${IMAGE_TAG}" . echo "*** BUILDING IDENTITY-SERVICE 6/$total ****************" -cd ../../../../services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host +cd ${currentFolder}/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host docker build --force-rm -t "eshoponabp/service-identity:${IMAGE_TAG}" . echo "*** BUILDING ADMINISTRATION-SERVICE 7/$total ****************" -cd ../../../administration/src/EShopOnAbp.AdministrationService.HttpApi.Host +cd ${currentFolder}/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host docker build --force-rm -t "eshoponabp/service-administration:${IMAGE_TAG}" . echo "**************** BUILDING BASKET-SERVICE 8/$total ****************" -cd ../../../basket/src/EShopOnAbp.BasketService +cd ${currentFolder}/services/basket/src/EShopOnAbp.BasketService docker build --force-rm -t "eshoponabp/service-basket:${IMAGE_TAG}" . echo "**************** BUILDING CATALOG-SERVICE 9/$total ****************" -cd ../../../catalog/src/EShopOnAbp.CatalogService.HttpApi.Host +cd ${currentFolder}/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host docker build --force-rm -t "eshoponabp/service-catalog:${IMAGE_TAG}" . echo "**************** BUILDING PAYMENT-SERVICE 10/$total ****************" -cd ../../../payment/src/EShopOnAbp.PaymentService.HttpApi.Host +cd ${currentFolder}/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host docker build --force-rm -t "eshoponabp/service-payment:${IMAGE_TAG}" . echo "**************** BUILDING ORDERING-SERVICE 11/$total ****************" -cd ../../../ordering/src/EShopOnAbp.OrderingService.HttpApi.Host +cd ${currentFolder}/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host docker build --force-rm -t "eshoponabp/service-ordering:${IMAGE_TAG}" . echo "ALL COMPLETED" \ No newline at end of file diff --git a/etc/k8s/azure/scripts/push-images.ps1 b/etc/k8s/azure/scripts/push-images.ps1 index 6b11caf2..3b1ac6fb 100644 --- a/etc/k8s/azure/scripts/push-images.ps1 +++ b/etc/k8s/azure/scripts/push-images.ps1 @@ -1,4 +1,4 @@ -param ($version='latest') +param ($version='1.0.0') az acr login --name volocr diff --git a/etc/k8s/azure/scripts/push-images.sh b/etc/k8s/azure/scripts/push-images.sh index dd187468..21a6d6a0 100755 --- a/etc/k8s/azure/scripts/push-images.sh +++ b/etc/k8s/azure/scripts/push-images.sh @@ -1,4 +1,4 @@ -export version="latest" +export version="1.0.0" az acr login --name volocr diff --git a/etc/k8s/eshoponabp/values.azure.yaml b/etc/k8s/eshoponabp/values.azure.yaml index d013446a..41040b9f 100644 --- a/etc/k8s/eshoponabp/values.azure.yaml +++ b/etc/k8s/eshoponabp/values.azure.yaml @@ -19,7 +19,7 @@ authserver: tlsSecret: eshop-wildcard-tls image: repository: "volocr.azurecr.io/eshoponabp/app-authserver" - tag: latest + tag: 1.0.0 # web sub-chart override web: @@ -28,13 +28,15 @@ web: gatewayUrl: https://gateway.eshoponabp.com authServer: authority: https://auth.eshoponabp.com - requireHttpsMetadata: "false" + requireHttpsMetadata: false responseType: "code" + strictDiscoveryDocumentValidation: false + skipIssuerCheck: true ingress: host: admin.eshoponabp.com image: repository: "volocr.azurecr.io/eshoponabp/app-web" - tag: latest + tag: 1.0.0 # public-web sub-chart override public-web: @@ -53,7 +55,7 @@ public-web: host: www.eshoponabp.com image: repository: "volocr.azurecr.io/eshoponabp/app-publicweb" - tag: latest + tag: 1.0.0 # identity-service sub-chart override identity: @@ -88,7 +90,7 @@ identity: host: identity.eshoponabp.com image: repository: "volocr.azurecr.io/eshoponabp/service-identity" - tag: latest + tag: 1.0.0 # administration sub-chart override administration: @@ -115,7 +117,7 @@ administration: host: administration.eshoponabp.com image: repository: "volocr.azurecr.io/eshoponabp/service-administration" - tag: latest + tag: 1.0.0 # gateway-web sub-chart override gateway-web: @@ -136,7 +138,7 @@ gateway-web: host: gateway.eshoponabp.com image: repository: "volocr.azurecr.io/eshoponabp/gateway-web" - tag: latest + tag: 1.0.0 reRoutes: accountService: url: http://eshop-az-authserver @@ -166,7 +168,7 @@ gateway-web-public: host: gateway-public.eshoponabp.com image: repository: "volocr.azurecr.io/eshoponabp/gateway-web-public" - tag: latest + tag: 1.0.0 reRoutes: accountService: url: http://eshop-az-authserver @@ -206,7 +208,7 @@ basket: host: basket.eshoponabp.com image: repository: "volocr.azurecr.io/eshoponabp/service-basket" - tag: latest + tag: 1.0.0 # catalog-service sub-chart override catalog: @@ -234,7 +236,7 @@ catalog: host: catalog.eshoponabp.com image: repository: "volocr.azurecr.io/eshoponabp/service-catalog" - tag: latest + tag: 1.0.0 # ordering-service sub-chart override ordering: @@ -257,7 +259,7 @@ ordering: host: order.eshoponabp.com image: repository: "volocr.azurecr.io/eshoponabp/service-ordering" - tag: latest + tag: 1.0.0 # payment-service sub-chart override payment: @@ -280,7 +282,7 @@ payment: host: payment.eshoponabp.com image: repository: "volocr.azurecr.io/eshoponabp/service-payment" - tag: latest + tag: 1.0.0 # Default values for eshoponabp. # This is a YAML-formatted file. diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index 93f5d346..33d64c41 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -19,7 +19,7 @@ authserver: tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/app-authserver" - tag: latest + tag: 1.0.0 # web sub-chart override web: @@ -28,14 +28,16 @@ web: gatewayUrl: https://eshop-st-gateway-web authServer: authority: http://eshop-st-authserver - requireHttpsMetadata: "false" + requireHttpsMetadata: false responseType: "code" + strictDiscoveryDocumentValidation: false + skipIssuerCheck: true ingress: host: eshop-st-web tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/app-web" - tag: latest + tag: 1.0.0 # public-web sub-chart override public-web: @@ -54,7 +56,7 @@ public-web: tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/app-publicweb" - tag: latest + tag: 1.0.0 # identity-service sub-chart override identity: @@ -90,7 +92,7 @@ identity: tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-identity" - tag: latest + tag: 1.0.0 # administration sub-chart override administration: @@ -118,7 +120,7 @@ administration: tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-administration" - tag: latest + tag: 1.0.0 # gateway-web sub-chart override gateway-web: @@ -140,7 +142,7 @@ gateway-web: tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/gateway-web" - tag: latest + tag: 1.0.0 reRoutes: accountService: url: http://eshop-st-authserver @@ -171,7 +173,7 @@ gateway-web-public: tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/gateway-web-public" - tag: latest + tag: 1.0.0 reRoutes: accountService: url: http://eshop-st-authserver @@ -212,7 +214,7 @@ basket: tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-basket" - tag: latest + tag: 1.0.0 # catalog-service sub-chart override catalog: @@ -241,7 +243,7 @@ catalog: tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-catalog" - tag: latest + tag: 1.0.0 # ordering-service sub-chart override ordering: @@ -265,7 +267,7 @@ ordering: tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-ordering" - tag: latest + tag: 1.0.0 # payment-service sub-chart override payment: @@ -289,7 +291,7 @@ payment: tlsSecret: eshop-wildcard-tls image: repository: "eshoponabp/service-payment" - tag: latest + tag: 1.0.0 # Default values for eshoponabp. # This is a YAML-formatted file.