From 8cea44193a16ea4eaa70b6be7cc526245d3c5ada Mon Sep 17 00:00:00 2001 From: yusuf karatoprak Date: Wed, 28 Apr 2021 09:03:03 +0300 Subject: [PATCH] update for Dockerfiles,manifests etc. --- .../.dockerignore | 0 .../Dockerfile.EventHub.Web | 0 azure-pipelines.yml | 8 ++-- ...oyment.yml => deployment.eventhub.web.yml} | 44 +++++++++---------- .../{service.yml => service.eventhub.web.yml} | 20 ++++----- src/EventHub.HttpApi.Host/.dockerignore copy | 15 ------- src/EventHub.Web/.dockerignore | 15 ------- src/EventHub.Web/Dockerfile | 19 -------- 8 files changed, 36 insertions(+), 85 deletions(-) rename {src/EventHub.HttpApi.Host => DockerFiles}/.dockerignore (100%) rename Dockerfile => DockerFiles/Dockerfile.EventHub.Web (100%) rename manifests/{deployment.yml => deployment.eventhub.web.yml} (95%) rename manifests/{service.yml => service.eventhub.web.yml} (86%) delete mode 100644 src/EventHub.HttpApi.Host/.dockerignore copy delete mode 100644 src/EventHub.Web/.dockerignore delete mode 100644 src/EventHub.Web/Dockerfile diff --git a/src/EventHub.HttpApi.Host/.dockerignore b/DockerFiles/.dockerignore similarity index 100% rename from src/EventHub.HttpApi.Host/.dockerignore rename to DockerFiles/.dockerignore diff --git a/Dockerfile b/DockerFiles/Dockerfile.EventHub.Web similarity index 100% rename from Dockerfile rename to DockerFiles/Dockerfile.EventHub.Web diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f189f99..60c8a35 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ # https://docs.microsoft.com/azure/devops/pipelines/languages/docker trigger: -- dev +- test variables: @@ -12,7 +12,7 @@ variables: dockerRegistryServiceConnection: '9a6341b6-70a5-4ee7-b7a2-5efa6d4f0fe3' imageRepository: 'volosofteventhub' containerRegistry: 'voloeventhub.azurecr.io' - dockerfilePath: '**/Dockerfile' + dockerfilePath: '**/DockerFiles/Dockerfile.EventHub.Web' tag: '$(Build.BuildNumber)' # Agent VM image name @@ -62,8 +62,8 @@ stages: inputs: action: deploy manifests: | - $(Pipeline.Workspace)/manifests/deployment.yml - $(Pipeline.Workspace)/manifests/service.yml + $(Pipeline.Workspace)/manifests/deployment.eventhub.web.yml + $(Pipeline.Workspace)/manifests/service.eventhub.web.yml containers: | $(containerRegistry)/$(imageRepository):$(tag) diff --git a/manifests/deployment.yml b/manifests/deployment.eventhub.web.yml similarity index 95% rename from manifests/deployment.yml rename to manifests/deployment.eventhub.web.yml index 8bb163d..37bca0f 100644 --- a/manifests/deployment.yml +++ b/manifests/deployment.eventhub.web.yml @@ -1,22 +1,22 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: volosoft-eventhub-web-deployment -spec: - selector: - matchLabels: - app: volosoft-eventhub-web-pod - template: - metadata: - labels: - app: volosoft-eventhub-web-pod - spec: - containers: - - name: volosoft-eventhub-web-container - image: voloeventhub.azurecr.io/voloeventhub:v1 - resources: - limits: - memory: "128Mi" - cpu: "500m" - ports: - - containerPort: 80 +apiVersion: apps/v1 +kind: Deployment +metadata: + name: volosoft-eventhub-web-deployment +spec: + selector: + matchLabels: + app: volosoft-eventhub-web-pod + template: + metadata: + labels: + app: volosoft-eventhub-web-pod + spec: + containers: + - name: volosoft-eventhub-web-container + image: voloeventhub.azurecr.io/voloeventhub:v1 + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 80 diff --git a/manifests/service.yml b/manifests/service.eventhub.web.yml similarity index 86% rename from manifests/service.yml rename to manifests/service.eventhub.web.yml index 4291539..a470dfd 100644 --- a/manifests/service.yml +++ b/manifests/service.eventhub.web.yml @@ -1,11 +1,11 @@ -apiVersion: v1 -kind: Service -metadata: - name: volosoft-eventhub-web-service -spec: - selector: - app: volosoft-eventhub-web-pod - ports: - - port: 8080 - targetPort: 80 +apiVersion: v1 +kind: Service +metadata: + name: volosoft-eventhub-web-service +spec: + selector: + app: volosoft-eventhub-web-pod + ports: + - port: 8080 + targetPort: 80 type: ClusterIP \ No newline at end of file diff --git a/src/EventHub.HttpApi.Host/.dockerignore copy b/src/EventHub.HttpApi.Host/.dockerignore copy deleted file mode 100644 index dbb5e63..0000000 --- a/src/EventHub.HttpApi.Host/.dockerignore copy +++ /dev/null @@ -1,15 +0,0 @@ -node_modules -npm-debug.log -Dockerfile* -docker-compose* -.dockerignore -.git -.gitignore -.env -*/bin -*/obj -bin -obj -README.md -LICENSE -.vscode \ No newline at end of file diff --git a/src/EventHub.Web/.dockerignore b/src/EventHub.Web/.dockerignore deleted file mode 100644 index dbb5e63..0000000 --- a/src/EventHub.Web/.dockerignore +++ /dev/null @@ -1,15 +0,0 @@ -node_modules -npm-debug.log -Dockerfile* -docker-compose* -.dockerignore -.git -.gitignore -.env -*/bin -*/obj -bin -obj -README.md -LICENSE -.vscode \ No newline at end of file diff --git a/src/EventHub.Web/Dockerfile b/src/EventHub.Web/Dockerfile deleted file mode 100644 index 8a0a056..0000000 --- a/src/EventHub.Web/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base -WORKDIR /app -EXPOSE 80 - -FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build -WORKDIR /src -COPY ["src/EventHub.Web/EventHub.Web.csproj", "src/EventHub.Web/"] -RUN dotnet restore "src/EventHub.Web/EventHub.Web.csproj" -COPY . . -WORKDIR "/src/src/EventHub.Web" -RUN dotnet build "EventHub.Web.csproj" -c Release -o /app - -FROM build AS publish -RUN dotnet publish "EventHub.Web.csproj" -c Release -o /app - -FROM base AS final -WORKDIR /app -COPY --from=publish /app . -ENTRYPOINT ["dotnet", "EventHub.Web.dll"] \ No newline at end of file