Browse Source

Upgrade to container base image net6.0 and add timeout for helm upgrade command

pull/71/head
Berkan Sasmaz 5 years ago
parent
commit
604b2ee040
  1. 4
      etc/azure/deploy-to-k8s.yml
  2. 2
      src/EventHub.Admin.HttpApi.Host/Dockerfile
  3. 2
      src/EventHub.BackgroundServices/Dockerfile
  4. 2
      src/EventHub.DbMigrator/Dockerfile
  5. 2
      src/EventHub.HttpApi.Host/Dockerfile
  6. 2
      src/EventHub.IdentityServer/Dockerfile
  7. 2
      src/EventHub.Web/Dockerfile

4
etc/azure/deploy-to-k8s.yml

@ -49,8 +49,6 @@ steps:
- task: HelmDeploy@0
displayName: Helm deploy
condition:
timeoutInMinutes: 20
inputs:
connectionType: 'Azure Resource Manager'
azureSubscription: 'volosoft(fe02ef9f-9e1c-4e40-b924-505981688dd8)'
@ -63,4 +61,4 @@ steps:
chartName: 'etc/k8s/helm-chart/eventhub'
releaseName: 'eh-az'
valueFile: 'etc/k8s/helm-chart/eventhub/values.azure.yaml'
arguments: '--namespace eventhub --create-namespace --set global.eventHubImageVersion=$(version)'
arguments: '--timeout 20m --namespace eventhub --create-namespace --set global.eventHubImageVersion=$(version)'

2
src/EventHub.Admin.HttpApi.Host/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
COPY bin/Release/net6.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.Admin.HttpApi.Host.dll"]

2
src/EventHub.BackgroundServices/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
COPY bin/Release/net6.0/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.BackgroundServices.dll"]

2
src/EventHub.DbMigrator/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
COPY bin/Release/net6.0/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.DbMigrator.dll"]

2
src/EventHub.HttpApi.Host/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
COPY bin/Release/net6.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.HttpApi.Host.dll"]

2
src/EventHub.IdentityServer/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
COPY bin/Release/net6.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.IdentityServer.dll"]

2
src/EventHub.Web/Dockerfile

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
COPY bin/Release/net6.0/publish/ app/
WORKDIR /app
ENTRYPOINT ["dotnet", "EventHub.Web.dll"]
Loading…
Cancel
Save