From 49d58e5b0b5cbf347a056a22f6df4c8c6ddcbf70 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 15:39:23 +0300 Subject: [PATCH 01/11] Created azure pipeline to CI of eshoponabp --- etc/k8s/azure/azure-pipelines.yml | 453 ++++++++++++++++++++++++++++++ 1 file changed, 453 insertions(+) create mode 100644 etc/k8s/azure/azure-pipelines.yml diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml new file mode 100644 index 00000000..8c175e43 --- /dev/null +++ b/etc/k8s/azure/azure-pipelines.yml @@ -0,0 +1,453 @@ +trigger: + branches: + include: + - main + paths: + include: + - apps/angular/src/** + - apps/public-web/src/EShopOnAbp.PublicWeb/** + - gateways/web/src/EShopOnAbp.WebGateway/** + - gateways/web-public/src/EShopOnAbp.WebPublicGateway/** + - services/administration/src/** + - services/basket/src/** + - services/catalog/src/** + - services/cmskit/src/** + - services/identity/src/** + - services/ordering/src/** + - services/payment/src/** + +resources: + repositories: + - repository: devops + type: github + endpoint: github.com_skoc10 + name: volosoft/devops + ref: master + +variables: + dockerRegistryServiceConnection: 'volosoft-reg' + buildContextBasePath: '$(Build.SourcesDirectory)' + tag: $(Build.BuildNumber) + DOCKER_BUILDKIT: 1 + +pool: + name: aks-deployer-agent + +stages: +- stage: Build + displayName: Build + jobs: + - job: Build + displayName: Build and Deploy Microservices + pool: + name: aks-deployer-agent + steps: + - checkout: self + - checkout: devops + + - script: | + function hasChanged { + local path=$1 + if git diff --name-only HEAD HEAD~1 | grep -q $path; then + echo "true" + else + echo "false" + fi + } + echo "##vso[task.setvariable variable=hasChangedAngular]$(hasChanged 'apps/angular/src/')" + echo "##vso[task.setvariable variable=hasChangedPublicWeb]$(hasChanged 'apps/public-web/src/EShopOnAbp.PublicWeb/')" + echo "##vso[task.setvariable variable=hasChangedWebGateway]$(hasChanged 'gateways/web/src/EShopOnAbp.WebGateway/')" + echo "##vso[task.setvariable variable=hasChangedWebPublicGateway]$(hasChanged 'gateways/web-public/src/EShopOnAbp.WebPublicGateway/')" + echo "##vso[task.setvariable variable=hasChangedAdministration]$(hasChanged 'services/administration/src/')" + echo "##vso[task.setvariable variable=hasChangedBasket]$(hasChanged 'services/basket/src/')" + echo "##vso[task.setvariable variable=hasChangedCatalog]$(hasChanged 'services/catalog/src/')" + echo "##vso[task.setvariable variable=hasChangedCmsKit]$(hasChanged 'services/cmskit/src/')" + echo "##vso[task.setvariable variable=hasChangedIdentity]$(hasChanged 'services/identity/src/')" + echo "##vso[task.setvariable variable=hasChangedOrdering]$(hasChanged 'services/ordering/src/')" + echo "##vso[task.setvariable variable=hasChangedPayment]$(hasChanged 'services/payment/src/')" + displayName: 'Check if the services have changed' + +# Angular App + - task: Docker@2 + condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + displayName: 'Build Angular App' + inputs: + command: build + repository: eshoponabp/app-web + dockerfile: $(buildContextBasePath)/eShopOnAbp/apps/angular/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker@2 + condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + displayName: 'Push Angular App' + inputs: + command: push + repository: eshoponabp/app-web + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy@0 + condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + displayName: 'Deploy Angular App' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web' + releaseName: 'administration' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web/values.yaml' + waitForExecution: false + +# Public Web + - task: Docker@2 + condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + displayName: 'Build Public Web' + inputs: + command: build + repository: eshoponabp/app-publicweb + dockerfile: $(buildContextBasePath)/eShopOnAbp/apps/public-web/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker@2 + condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + displayName: 'Push Public Web' + inputs: + command: push + repository: eshoponabp/app-publicweb + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy@0 + condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + displayName: 'Deploy Public Web' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web' + releaseName: 'public-web' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web/values.yaml' + waitForExecution: false + +# Web Gateway + - task: Docker@2 + condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + displayName: 'Build Web Gateway' + inputs: + command: build + repository: eshoponabp/gateway-web + dockerfile: $(buildContextBasePath)/eShopOnAbp/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker@2 + condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + displayName: 'Push Web Gateway' + inputs: + command: push + repository: eshoponabp/gateway-web + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy@0 + condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + displayName: 'Deploy Web Gateway' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web' + releaseName: 'web-gateway' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web/values.yaml' + waitForExecution: false + +# Web Public Gateway + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + displayName: 'Build Web Public Gateway' + inputs: + command: build + repository: eshoponabp/gateway-web-public + dockerfile: $(buildContextBasePath)/eShopOnAbp/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + displayName: 'Push Web Public Gateway' + inputs: + command: push + repository: eshoponabp/gateway-web-public + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy + condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + displayName: 'Deploy Web Public Gateway' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public' + releaseName: 'web-public-gateway' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public/values.yaml' + waitForExecution: false + +# Administration + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + displayName: 'Build Administration' + inputs: + command: build + repository: eshoponabp/service-administration + dockerfile: $(buildContextBasePath)/eShopOnAbp/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + displayName: 'Push Administration' + inputs: + command: push + repository: eshoponabp/service-administration + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy + condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + displayName: 'Deploy Administration' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration' + releaseName: 'administration' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration/values.yaml' + waitForExecution: false + +# Basket + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + displayName: 'Build Basket' + inputs: + command: build + repository: eshoponabp/service-basket + dockerfile: $(buildContextBasePath)/eShopOnAbp/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + displayName: 'Push Basket' + inputs: + command: push + repository: eshoponabp/service-basket + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy + condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + displayName: 'Deploy Basket' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket' + releaseName: 'basket' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket/values.yaml' + waitForExecution: false + +# Catalog + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + displayName: 'Build Catalog' + inputs: + command: build + repository: eshoponabp/service-catalog + dockerfile: $(buildContextBasePath)/eShopOnAbp/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + displayName: 'Push Catalog' + inputs: + command: push + repository: eshoponabp/service-catalog + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy + condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + displayName: 'Deploy Catalog' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog' + releaseName: 'catalog' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog/values.yaml' + waitForExecution: false + +# cmskit + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + displayName: 'Build CmsKit' + inputs: + command: build + repository: eshoponabp/service-cmskit + dockerfile: $(buildContextBasePath)/eShopOnAbp/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + displayName: 'Push CmsKit' + inputs: + command: push + repository: eshoponabp/service-cmskit + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy + condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + displayName: 'Deploy CmsKit' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit' + releaseName: 'cmskit' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit/values.yaml' + waitForExecution: false + +# Identity + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + displayName: 'Build Identity' + inputs: + command: build + repository: eshoponabp/service-identity + dockerfile: $(buildContextBasePath)/eShopOnAbp/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + displayName: 'Push Identity' + inputs: + command: push + repository: eshoponabp/service-identity + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy + condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + displayName: 'Deploy Identity' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity' + releaseName: 'identity' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity/values.yaml' + waitForExecution: false + +# Ordering + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + displayName: 'Build Ordering' + inputs: + command: build + repository: eshoponabp/service-ordering + dockerfile: $(buildContextBasePath)/eShopOnAbp/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + displayName: 'Push Ordering' + inputs: + command: push + repository: eshoponabp/service-ordering + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy + condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + displayName: 'Deploy Ordering' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering' + releaseName: 'ordering' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering/values.yaml' + waitForExecution: false + +# Payment + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + displayName: 'Build Payment' + inputs: + command: build + repository: eshoponabp/service-payment + dockerfile: $(buildContextBasePath)/eShopOnAbp/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: Docker + condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + displayName: 'Push Payment' + inputs: + command: push + repository: eshoponabp/service-payment + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + - task: HelmDeploy + condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + displayName: 'Deploy Payment' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment' + releaseName: 'payment' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment/values.yaml' + waitForExecution: false \ No newline at end of file From dc93c67b935cfa1822f279a7def7ed77024ea9b2 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 15:45:28 +0300 Subject: [PATCH 02/11] Change brach for testing --- etc/k8s/azure/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index 8c175e43..fc8e1e8b 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -1,7 +1,7 @@ trigger: branches: include: - - main + - skoc/azure-pipeline paths: include: - apps/angular/src/** @@ -74,7 +74,7 @@ stages: inputs: command: build repository: eshoponabp/app-web - dockerfile: $(buildContextBasePath)/eShopOnAbp/apps/angular/Dockerfile.azure + dockerfile: $(buildContextBasePath)/eShopOnAbp/apps/angular/Dockerfile containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) From ddaa0e90b74ee90716607cb0a80505d42a7f8d6e Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 16:33:27 +0300 Subject: [PATCH 03/11] Cancel helm deploying to test --- etc/k8s/azure/azure-pipelines.yml | 310 +++++++++++++++--------------- 1 file changed, 155 insertions(+), 155 deletions(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index fc8e1e8b..c47c87ec 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -74,7 +74,7 @@ stages: inputs: command: build repository: eshoponabp/app-web - dockerfile: $(buildContextBasePath)/eShopOnAbp/apps/angular/Dockerfile + dockerfile: $(buildContextBasePath)/eShopOnAbp/apps/angular/Dockerfile.azure containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) @@ -87,20 +87,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) - displayName: 'Deploy Angular App' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web' - releaseName: 'administration' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web/values.yaml' - waitForExecution: false + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + # displayName: 'Deploy Angular App' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web' + # releaseName: 'administration' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web/values.yaml' + # waitForExecution: false # Public Web - task: Docker@2 @@ -122,20 +122,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) - displayName: 'Deploy Public Web' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web' - releaseName: 'public-web' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web/values.yaml' - waitForExecution: false + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + # displayName: 'Deploy Public Web' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web' + # releaseName: 'public-web' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web/values.yaml' + # waitForExecution: false # Web Gateway - task: Docker@2 @@ -157,20 +157,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) - displayName: 'Deploy Web Gateway' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web' - releaseName: 'web-gateway' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web/values.yaml' - waitForExecution: false + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + # displayName: 'Deploy Web Gateway' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web' + # releaseName: 'web-gateway' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web/values.yaml' + # waitForExecution: false # Web Public Gateway - task: Docker @@ -192,20 +192,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy - condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) - displayName: 'Deploy Web Public Gateway' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public' - releaseName: 'web-public-gateway' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public/values.yaml' - waitForExecution: false + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + # displayName: 'Deploy Web Public Gateway' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public' + # releaseName: 'web-public-gateway' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public/values.yaml' + # waitForExecution: false # Administration - task: Docker @@ -227,20 +227,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy - condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) - displayName: 'Deploy Administration' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration' - releaseName: 'administration' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration/values.yaml' - waitForExecution: false + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + # displayName: 'Deploy Administration' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration' + # releaseName: 'administration' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration/values.yaml' + # waitForExecution: false # Basket - task: Docker @@ -262,20 +262,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy - condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) - displayName: 'Deploy Basket' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket' - releaseName: 'basket' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket/values.yaml' - waitForExecution: false + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + # displayName: 'Deploy Basket' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket' + # releaseName: 'basket' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket/values.yaml' + # waitForExecution: false # Catalog - task: Docker @@ -297,20 +297,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy - condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) - displayName: 'Deploy Catalog' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog' - releaseName: 'catalog' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog/values.yaml' - waitForExecution: false + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + # displayName: 'Deploy Catalog' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog' + # releaseName: 'catalog' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog/values.yaml' + # waitForExecution: false # cmskit - task: Docker @@ -332,20 +332,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy - condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) - displayName: 'Deploy CmsKit' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit' - releaseName: 'cmskit' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit/values.yaml' - waitForExecution: false + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + # displayName: 'Deploy CmsKit' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit' + # releaseName: 'cmskit' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit/values.yaml' + # waitForExecution: false # Identity - task: Docker @@ -367,20 +367,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy - condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) - displayName: 'Deploy Identity' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity' - releaseName: 'identity' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity/values.yaml' - waitForExecution: false + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + # displayName: 'Deploy Identity' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity' + # releaseName: 'identity' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity/values.yaml' + # waitForExecution: false # Ordering - task: Docker @@ -402,20 +402,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy - condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) - displayName: 'Deploy Ordering' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering' - releaseName: 'ordering' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering/values.yaml' - waitForExecution: false + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + # displayName: 'Deploy Ordering' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering' + # releaseName: 'ordering' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering/values.yaml' + # waitForExecution: false # Payment - task: Docker @@ -437,17 +437,17 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: HelmDeploy - condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) - displayName: 'Deploy Payment' - inputs: - connectionType: Kubernetes Service Connection - kubernetesServiceConnection: 'aks-demoms' - namespace: 'eshop' - command: 'upgrade' - hartType: 'FilePath' - chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment' - releaseName: 'payment' - overrideValues: 'image.tag=$(tag)' - valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment/values.yaml' - waitForExecution: false \ No newline at end of file + # - task: HelmDeploy@0 + # condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + # displayName: 'Deploy Payment' + # inputs: + # connectionType: Kubernetes Service Connection + # kubernetesServiceConnection: 'aks-demoms' + # namespace: 'eshop' + # command: 'upgrade' + # hartType: 'FilePath' + # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment' + # releaseName: 'payment' + # overrideValues: 'image.tag=$(tag)' + # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment/values.yaml' + # waitForExecution: false \ No newline at end of file From 27e9403de28a35d880f984bd0eca0f08b4dbd59d Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 16:49:05 +0300 Subject: [PATCH 04/11] Cancel condition --- etc/k8s/azure/azure-pipelines.yml | 66 +++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index c47c87ec..b9391e79 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -69,7 +69,7 @@ stages: # Angular App - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) displayName: 'Build Angular App' inputs: command: build @@ -79,7 +79,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) displayName: 'Push Angular App' inputs: command: push @@ -88,7 +88,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) # displayName: 'Deploy Angular App' # inputs: # connectionType: Kubernetes Service Connection @@ -104,7 +104,7 @@ stages: # Public Web - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) displayName: 'Build Public Web' inputs: command: build @@ -114,7 +114,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) displayName: 'Push Public Web' inputs: command: push @@ -123,7 +123,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) # displayName: 'Deploy Public Web' # inputs: # connectionType: Kubernetes Service Connection @@ -139,7 +139,7 @@ stages: # Web Gateway - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) displayName: 'Build Web Gateway' inputs: command: build @@ -149,7 +149,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) displayName: 'Push Web Gateway' inputs: command: push @@ -158,7 +158,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) # displayName: 'Deploy Web Gateway' # inputs: # connectionType: Kubernetes Service Connection @@ -174,7 +174,7 @@ stages: # Web Public Gateway - task: Docker - condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) displayName: 'Build Web Public Gateway' inputs: command: build @@ -184,7 +184,7 @@ stages: tags: | $(tag) - task: Docker - condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) displayName: 'Push Web Public Gateway' inputs: command: push @@ -193,7 +193,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) # displayName: 'Deploy Web Public Gateway' # inputs: # connectionType: Kubernetes Service Connection @@ -209,7 +209,7 @@ stages: # Administration - task: Docker - condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) displayName: 'Build Administration' inputs: command: build @@ -219,7 +219,7 @@ stages: tags: | $(tag) - task: Docker - condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) displayName: 'Push Administration' inputs: command: push @@ -228,7 +228,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) # displayName: 'Deploy Administration' # inputs: # connectionType: Kubernetes Service Connection @@ -244,7 +244,7 @@ stages: # Basket - task: Docker - condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) displayName: 'Build Basket' inputs: command: build @@ -254,7 +254,7 @@ stages: tags: | $(tag) - task: Docker - condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) displayName: 'Push Basket' inputs: command: push @@ -263,7 +263,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) # displayName: 'Deploy Basket' # inputs: # connectionType: Kubernetes Service Connection @@ -279,7 +279,7 @@ stages: # Catalog - task: Docker - condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) displayName: 'Build Catalog' inputs: command: build @@ -289,7 +289,7 @@ stages: tags: | $(tag) - task: Docker - condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) displayName: 'Push Catalog' inputs: command: push @@ -298,7 +298,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) # displayName: 'Deploy Catalog' # inputs: # connectionType: Kubernetes Service Connection @@ -314,7 +314,7 @@ stages: # cmskit - task: Docker - condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) displayName: 'Build CmsKit' inputs: command: build @@ -324,7 +324,7 @@ stages: tags: | $(tag) - task: Docker - condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) displayName: 'Push CmsKit' inputs: command: push @@ -333,7 +333,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) # displayName: 'Deploy CmsKit' # inputs: # connectionType: Kubernetes Service Connection @@ -349,7 +349,7 @@ stages: # Identity - task: Docker - condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) displayName: 'Build Identity' inputs: command: build @@ -359,7 +359,7 @@ stages: tags: | $(tag) - task: Docker - condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) displayName: 'Push Identity' inputs: command: push @@ -368,7 +368,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) # displayName: 'Deploy Identity' # inputs: # connectionType: Kubernetes Service Connection @@ -384,7 +384,7 @@ stages: # Ordering - task: Docker - condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) displayName: 'Build Ordering' inputs: command: build @@ -394,7 +394,7 @@ stages: tags: | $(tag) - task: Docker - condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) displayName: 'Push Ordering' inputs: command: push @@ -403,7 +403,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) # displayName: 'Deploy Ordering' # inputs: # connectionType: Kubernetes Service Connection @@ -419,7 +419,7 @@ stages: # Payment - task: Docker - condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) displayName: 'Build Payment' inputs: command: build @@ -429,7 +429,7 @@ stages: tags: | $(tag) - task: Docker - condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) displayName: 'Push Payment' inputs: command: push @@ -438,7 +438,7 @@ stages: tags: | $(tag) # - task: HelmDeploy@0 - # condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + # #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) # displayName: 'Deploy Payment' # inputs: # connectionType: Kubernetes Service Connection From 7c73ccfcbee2097755d7564efa22a8a6bbe3b770 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 16:58:32 +0300 Subject: [PATCH 05/11] Create new Dockerfile for azure devops build --- apps/angular/Dockerfile.azure | 15 +++++++++++++++ .../src/EShopOnAbp.PublicWeb/Dockerfile.azure | 10 ++++++++++ .../EShopOnAbp.WebPublicGateway/Dockerfile.azure | 10 ++++++++++ .../src/EShopOnAbp.WebGateway/Dockerfile.azure | 10 ++++++++++ .../Dockerfile.azure | 10 ++++++++++ .../src/EShopOnAbp.BasketService/Dockerfile.azure | 10 ++++++++++ .../Dockerfile.azure | 10 ++++++++++ .../Dockerfile.azure | 10 ++++++++++ .../Dockerfile.azure | 10 ++++++++++ .../Dockerfile.azure | 10 ++++++++++ .../Dockerfile.azure | 10 ++++++++++ 11 files changed, 115 insertions(+) create mode 100644 apps/angular/Dockerfile.azure create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure create mode 100644 gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure create mode 100644 gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure create mode 100644 services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure create mode 100644 services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure create mode 100644 services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure create mode 100644 services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure create mode 100644 services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure create mode 100644 services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure create mode 100644 services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure diff --git a/apps/angular/Dockerfile.azure b/apps/angular/Dockerfile.azure new file mode 100644 index 00000000..0eb0fcc5 --- /dev/null +++ b/apps/angular/Dockerfile.azure @@ -0,0 +1,15 @@ +FROM node:18-alpine as build + +WORKDIR /app +COPY package*.json /app/ + +RUN npm install +COPY . /app +ARG configuration=production +RUN npm run ng build -- --output-path=dist/EShopOnAbp --configuration $configuration + +FROM nginx:alpine +COPY dynamic-env.json /usr/share/nginx/html +COPY nginx.conf /etc/nginx/conf.d/default.conf + +COPY --from=build /app/dist/EShopOnAbp/ /usr/share/nginx/html diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure new file mode 100644 index 00000000..c9018dc9 --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure @@ -0,0 +1,10 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /src +COPY eShopOnAbp . +WORKDIR /src/eShopOnAbp/apps/public-web/src/EShopOnAbp.PublicWeb +RUN dotnet publish -c Release -o bin/Release/publish + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final +WORKDIR /app +COPY --from=build /src/eShopOnAbp/apps/public-web/src/EShopOnAbp.PublicWeb/bin/Release/publish/ . +ENTRYPOINT ["dotnet", "EShopOnAbp.PublicWeb.dll"] \ No newline at end of file diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure new file mode 100644 index 00000000..fb298302 --- /dev/null +++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure @@ -0,0 +1,10 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /src +COPY eShopOnAbp . +WORKDIR /src/eShopOnAbp/gateways/web-public/src/EShopOnAbp.WebPublicGateway +RUN dotnet publish -c Release -o bin/Release/publish + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final +WORKDIR /app +COPY --from=build /src/eShopOnAbp/gateways/web-public/src/EShopOnAbp.WebPublicGateway/bin/Release/publish/ . +ENTRYPOINT ["dotnet", "EShopOnAbp.WebPublicGateway.dll"] \ No newline at end of file diff --git a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure new file mode 100644 index 00000000..e91a6070 --- /dev/null +++ b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure @@ -0,0 +1,10 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /src +COPY eShopOnAbp . +WORKDIR /src/eShopOnAbp/gateways/web/src/EShopOnAbp.WebGateway +RUN dotnet publish -c Release -o bin/Release/publish + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final +WORKDIR /app +COPY --from=build /src/eShopOnAbp/gateways/web/src/EShopOnAbp.WebGateway/bin/Release/publish/ . +ENTRYPOINT ["dotnet", "EShopOnAbp.WebGateway.dll"] \ No newline at end of file diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure new file mode 100644 index 00000000..df6ae490 --- /dev/null +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure @@ -0,0 +1,10 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /src +COPY eShopOnAbp . +WORKDIR /src/eShopOnAbp/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host +RUN dotnet publish -c Release -o bin/Release/publish + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final +WORKDIR /app +COPY --from=build /src/eShopOnAbp/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/bin/Release/publish/ . +ENTRYPOINT ["dotnet", "EShopOnAbp.AdministrationService.HttpApi.Host.dll"] \ No newline at end of file diff --git a/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure b/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure new file mode 100644 index 00000000..d92d3203 --- /dev/null +++ b/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure @@ -0,0 +1,10 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /src +COPY eShopOnAbp . +WORKDIR /src/eShopOnAbp/services/basket/src/EShopOnAbp.BasketService +RUN dotnet publish -c Release -o bin/Release/publish + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final +WORKDIR /app +COPY --from=build /src/eShopOnAbp/services/basket/src/EShopOnAbp.BasketService/bin/Release/publish/ . +ENTRYPOINT ["dotnet", "EShopOnAbp.BasketService.dll"] \ No newline at end of file diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure new file mode 100644 index 00000000..2a592ab1 --- /dev/null +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure @@ -0,0 +1,10 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /src +COPY eShopOnAbp . +WORKDIR /src/eShopOnAbp/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host +RUN dotnet publish -c Release -o bin/Release/publish + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 +WORKDIR /app +COPY --from=build /src/eShopOnAbp/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/bin/Release/publish/ . +ENTRYPOINT ["dotnet", "EShopOnAbp.CatalogService.HttpApi.Host.dll"] \ No newline at end of file diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure new file mode 100644 index 00000000..4229f3f6 --- /dev/null +++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure @@ -0,0 +1,10 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /src +COPY eShopOnAbp . +WORKDIR /src/eShopOnAbp/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host +RUN dotnet publish -c Release -o bin/Release/publish + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 +WORKDIR /app +COPY --from=build /src/eShopOnAbp/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/bin/Release/publish/ . +ENTRYPOINT ["dotnet", "EShopOnAbp.CmskitService.HttpApi.Host.dll"] \ No newline at end of file diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure new file mode 100644 index 00000000..7ae4d505 --- /dev/null +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure @@ -0,0 +1,10 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /src +COPY eShopOnAbp . +WORKDIR /src/eShopOnAbp/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host +RUN dotnet publish -c Release -o bin/Release/publish + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final +WORKDIR /app +COPY --from=build /src/eShopOnAbp/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/bin/Release/publish/ . +ENTRYPOINT ["dotnet", "EShopOnAbp.IdentityService.HttpApi.Host.dll"] \ No newline at end of file diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure new file mode 100644 index 00000000..20cfaded --- /dev/null +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure @@ -0,0 +1,10 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /src +COPY eShopOnAbp . +WORKDIR /src/eShopOnAbp/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host +RUN dotnet publish -c Release -o bin/Release/publish + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final +WORKDIR /app +COPY --from=build /src/eShopOnAbp/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/bin/Release/publish/ . +ENTRYPOINT ["dotnet", "EShopOnAbp.OrderingService.HttpApi.Host.dll"] \ No newline at end of file diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure new file mode 100644 index 00000000..d9a02d17 --- /dev/null +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure @@ -0,0 +1,10 @@ +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +WORKDIR /src +COPY eShopOnAbp . +WORKDIR /src/eShopOnAbp/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host +RUN dotnet publish -c Release -o bin/Release/publish + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final +WORKDIR /app +COPY --from=build /src/eShopOnAbp/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/bin/Release/publish/ . +ENTRYPOINT ["dotnet", "EShopOnAbp.PaymentService.HttpApi.Host.dll"] \ No newline at end of file From ca984a7761192f66af92ae3e18fcb25116a06e97 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 17:01:47 +0300 Subject: [PATCH 06/11] Added buildContext: $(buildContextBasePath) --- etc/k8s/azure/azure-pipelines.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index b9391e79..5c5e5e9d 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -110,6 +110,7 @@ stages: command: build repository: eshoponabp/app-publicweb dockerfile: $(buildContextBasePath)/eShopOnAbp/apps/public-web/Dockerfile.azure + buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) @@ -145,6 +146,7 @@ stages: command: build repository: eshoponabp/gateway-web dockerfile: $(buildContextBasePath)/eShopOnAbp/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure + buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) @@ -180,6 +182,7 @@ stages: command: build repository: eshoponabp/gateway-web-public dockerfile: $(buildContextBasePath)/eShopOnAbp/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure + buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) @@ -215,6 +218,7 @@ stages: command: build repository: eshoponabp/service-administration dockerfile: $(buildContextBasePath)/eShopOnAbp/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure + buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) @@ -250,6 +254,7 @@ stages: command: build repository: eshoponabp/service-basket dockerfile: $(buildContextBasePath)/eShopOnAbp/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure + buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) @@ -285,6 +290,7 @@ stages: command: build repository: eshoponabp/service-catalog dockerfile: $(buildContextBasePath)/eShopOnAbp/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure + buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) @@ -320,6 +326,7 @@ stages: command: build repository: eshoponabp/service-cmskit dockerfile: $(buildContextBasePath)/eShopOnAbp/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure + buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) @@ -355,6 +362,7 @@ stages: command: build repository: eshoponabp/service-identity dockerfile: $(buildContextBasePath)/eShopOnAbp/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure + buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) @@ -390,6 +398,7 @@ stages: command: build repository: eshoponabp/service-ordering dockerfile: $(buildContextBasePath)/eShopOnAbp/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure + buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) @@ -425,6 +434,7 @@ stages: command: build repository: eshoponabp/service-payment dockerfile: $(buildContextBasePath)/eShopOnAbp/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure + buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) From 15c3152cb6e3938953dd09d9d0465472fdc31902 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 17:07:27 +0300 Subject: [PATCH 07/11] fix - task: Docker@2 --- etc/k8s/azure/azure-pipelines.yml | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index 5c5e5e9d..fc3d239b 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -175,7 +175,7 @@ stages: # waitForExecution: false # Web Public Gateway - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) displayName: 'Build Web Public Gateway' inputs: @@ -186,7 +186,7 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) displayName: 'Push Web Public Gateway' inputs: @@ -211,7 +211,7 @@ stages: # waitForExecution: false # Administration - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) displayName: 'Build Administration' inputs: @@ -222,7 +222,7 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) displayName: 'Push Administration' inputs: @@ -247,7 +247,7 @@ stages: # waitForExecution: false # Basket - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) displayName: 'Build Basket' inputs: @@ -258,7 +258,7 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) displayName: 'Push Basket' inputs: @@ -283,7 +283,7 @@ stages: # waitForExecution: false # Catalog - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) displayName: 'Build Catalog' inputs: @@ -294,7 +294,7 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) displayName: 'Push Catalog' inputs: @@ -319,7 +319,7 @@ stages: # waitForExecution: false # cmskit - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) displayName: 'Build CmsKit' inputs: @@ -330,7 +330,7 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) displayName: 'Push CmsKit' inputs: @@ -355,7 +355,7 @@ stages: # waitForExecution: false # Identity - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) displayName: 'Build Identity' inputs: @@ -366,7 +366,7 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) displayName: 'Push Identity' inputs: @@ -391,7 +391,7 @@ stages: # waitForExecution: false # Ordering - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) displayName: 'Build Ordering' inputs: @@ -402,7 +402,7 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) displayName: 'Push Ordering' inputs: @@ -427,7 +427,7 @@ stages: # waitForExecution: false # Payment - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) displayName: 'Build Payment' inputs: @@ -438,7 +438,7 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - - task: Docker + - task: Docker@2 #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) displayName: 'Push Payment' inputs: From eb0a15f81d705bf4d75cf49e246a9eca7f18453e Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 17:10:05 +0300 Subject: [PATCH 08/11] change npm with yarn --- apps/angular/Dockerfile.azure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/angular/Dockerfile.azure b/apps/angular/Dockerfile.azure index 0eb0fcc5..e4aa6cf8 100644 --- a/apps/angular/Dockerfile.azure +++ b/apps/angular/Dockerfile.azure @@ -3,7 +3,7 @@ FROM node:18-alpine as build WORKDIR /app COPY package*.json /app/ -RUN npm install +RUN yarn install COPY . /app ARG configuration=production RUN npm run ng build -- --output-path=dist/EShopOnAbp --configuration $configuration From 0f5ebfbe118d5668d6fbe2c07156a3e24d3e11d6 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 17:48:09 +0300 Subject: [PATCH 09/11] fix path of web-public dockerfile --- etc/k8s/azure/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index fc3d239b..d5273739 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -109,7 +109,7 @@ stages: inputs: command: build repository: eshoponabp/app-publicweb - dockerfile: $(buildContextBasePath)/eShopOnAbp/apps/public-web/Dockerfile.azure + dockerfile: $(buildContextBasePath)/eShopOnAbp/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure buildContext: $(buildContextBasePath) containerRegistry: $(dockerRegistryServiceConnection) tags: | From 53c0677638b2935a94b442e471cbc1819975e90e Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 18:15:18 +0300 Subject: [PATCH 10/11] COPY eShopOnAbp ./eShopOnAbp. --- apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure | 2 +- .../web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure | 2 +- gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure | 2 +- .../Dockerfile.azure | 2 +- services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure | 2 +- .../src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure | 2 +- .../src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure | 2 +- .../EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure | 2 +- .../EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure | 2 +- .../src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure index c9018dc9..c64d4c11 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp . +COPY eShopOnAbp ./eShopOnAbp. WORKDIR /src/eShopOnAbp/apps/public-web/src/EShopOnAbp.PublicWeb RUN dotnet publish -c Release -o bin/Release/publish diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure index fb298302..8c571993 100644 --- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure +++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp . +COPY eShopOnAbp ./eShopOnAbp. WORKDIR /src/eShopOnAbp/gateways/web-public/src/EShopOnAbp.WebPublicGateway RUN dotnet publish -c Release -o bin/Release/publish diff --git a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure index e91a6070..c3f8a46f 100644 --- a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure +++ b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp . +COPY eShopOnAbp ./eShopOnAbp. WORKDIR /src/eShopOnAbp/gateways/web/src/EShopOnAbp.WebGateway RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure index df6ae490..d53eb3bf 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp . +COPY eShopOnAbp ./eShopOnAbp. WORKDIR /src/eShopOnAbp/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure b/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure index d92d3203..a7a67b36 100644 --- a/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure +++ b/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp . +COPY eShopOnAbp ./eShopOnAbp. WORKDIR /src/eShopOnAbp/services/basket/src/EShopOnAbp.BasketService RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure index 2a592ab1..1bd4dc62 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp . +COPY eShopOnAbp ./eShopOnAbp. WORKDIR /src/eShopOnAbp/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure index 4229f3f6..ced9d1b7 100644 --- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure +++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp . +COPY eShopOnAbp ./eShopOnAbp. WORKDIR /src/eShopOnAbp/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure index 7ae4d505..00fef7d7 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp . +COPY eShopOnAbp ./eShopOnAbp. WORKDIR /src/eShopOnAbp/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure index 20cfaded..196121cf 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp . +COPY eShopOnAbp ./eShopOnAbp. WORKDIR /src/eShopOnAbp/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure index d9a02d17..a363a5cb 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp . +COPY eShopOnAbp ./eShopOnAbp. WORKDIR /src/eShopOnAbp/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish From b723d92ee55710390ab1ee8a2a40bf7e9243d288 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Thu, 16 May 2024 18:16:47 +0300 Subject: [PATCH 11/11] fix typo --- apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure | 2 +- .../web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure | 2 +- gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure | 2 +- .../Dockerfile.azure | 2 +- services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure | 2 +- .../src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure | 2 +- .../src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure | 2 +- .../EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure | 2 +- .../EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure | 2 +- .../src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure index c64d4c11..ae79ac14 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp ./eShopOnAbp. +COPY eShopOnAbp ./eShopOnAbp WORKDIR /src/eShopOnAbp/apps/public-web/src/EShopOnAbp.PublicWeb RUN dotnet publish -c Release -o bin/Release/publish diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure index 8c571993..e562309c 100644 --- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure +++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp ./eShopOnAbp. +COPY eShopOnAbp ./eShopOnAbp WORKDIR /src/eShopOnAbp/gateways/web-public/src/EShopOnAbp.WebPublicGateway RUN dotnet publish -c Release -o bin/Release/publish diff --git a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure index c3f8a46f..fe0a77e0 100644 --- a/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure +++ b/gateways/web/src/EShopOnAbp.WebGateway/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp ./eShopOnAbp. +COPY eShopOnAbp ./eShopOnAbp WORKDIR /src/eShopOnAbp/gateways/web/src/EShopOnAbp.WebGateway RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure index d53eb3bf..6c0a76a7 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp ./eShopOnAbp. +COPY eShopOnAbp ./eShopOnAbp WORKDIR /src/eShopOnAbp/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure b/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure index a7a67b36..db788eb2 100644 --- a/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure +++ b/services/basket/src/EShopOnAbp.BasketService/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp ./eShopOnAbp. +COPY eShopOnAbp ./eShopOnAbp WORKDIR /src/eShopOnAbp/services/basket/src/EShopOnAbp.BasketService RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure index 1bd4dc62..f8380a9b 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp ./eShopOnAbp. +COPY eShopOnAbp ./eShopOnAbp WORKDIR /src/eShopOnAbp/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure index ced9d1b7..5d6106ed 100644 --- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure +++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp ./eShopOnAbp. +COPY eShopOnAbp ./eShopOnAbp WORKDIR /src/eShopOnAbp/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure index 00fef7d7..5f9c074c 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp ./eShopOnAbp. +COPY eShopOnAbp ./eShopOnAbp WORKDIR /src/eShopOnAbp/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure index 196121cf..8e065f29 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp ./eShopOnAbp. +COPY eShopOnAbp ./eShopOnAbp WORKDIR /src/eShopOnAbp/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure index a363a5cb..11a5f2fe 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.azure @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src -COPY eShopOnAbp ./eShopOnAbp. +COPY eShopOnAbp ./eShopOnAbp WORKDIR /src/eShopOnAbp/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host RUN dotnet publish -c Release -o bin/Release/publish