update for Dockerfiles,manifests etc.

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)
 

manifests/deployment.yml → 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

manifests/service.yml → 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

src/EventHub.HttpApi.Host/.dockerignore copy

@@ -1,15 +0,0 @@
-node_modules
-npm-debug.log
-Dockerfile*
-docker-compose*
-.dockerignore
-.git
-.gitignore
-.env
-*/bin
-*/obj
-bin
-obj
-README.md
-LICENSE
-.vscode

src/EventHub.Web/.dockerignore

@@ -1,15 +0,0 @@
-node_modules
-npm-debug.log
-Dockerfile*
-docker-compose*
-.dockerignore
-.git
-.gitignore
-.env
-*/bin
-*/obj
-bin
-obj
-README.md
-LICENSE
-.vscode

src/EventHub.Web/Dockerfile

@@ -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"]