updated files to new devspaces format

This commit is contained in:
eiximenis 2019-02-13 10:02:07 +01:00
parent eed86811aa
commit 820330556b
8 changed files with 22 additions and 25 deletions

View File

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1-sdk FROM microsoft/dotnet:2.2.100-sdk
ENV ASPNETCORE_ENVIRONMENT=Development ENV ASPNETCORE_ENVIRONMENT=Development
ENV DOTNET_USE_POLLING_FILE_WATCHER=true ENV DOTNET_USE_POLLING_FILE_WATCHER=true

View File

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1-sdk FROM microsoft/dotnet:2.2.100-sdk
ARG BUILD_CONFIGURATION=Debug ARG BUILD_CONFIGURATION=Debug
ENV ASPNETCORE_ENVIRONMENT=Development ENV ASPNETCORE_ENVIRONMENT=Development
ENV DOTNET_USE_POLLING_FILE_WATCHER=true ENV DOTNET_USE_POLLING_FILE_WATCHER=true

View File

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1-sdk FROM microsoft/dotnet:2.2.100-sdk
ENV ASPNETCORE_ENVIRONMENT=Development ENV ASPNETCORE_ENVIRONMENT=Development
ENV DOTNET_USE_POLLING_FILE_WATCHER=true ENV DOTNET_USE_POLLING_FILE_WATCHER=true

View File

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1-sdk FROM microsoft/dotnet:2.2.100-sdk
ARG BUILD_CONFIGURATION=Debug ARG BUILD_CONFIGURATION=Debug
ENV ASPNETCORE_ENVIRONMENT=Development ENV ASPNETCORE_ENVIRONMENT=Development
ENV DOTNET_USE_POLLING_FILE_WATCHER=true ENV DOTNET_USE_POLLING_FILE_WATCHER=true

View File

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1-sdk FROM microsoft/dotnet:2.2.100-sdk
ARG BUILD_CONFIGURATION=Debug ARG BUILD_CONFIGURATION=Debug
ENV ASPNETCORE_ENVIRONMENT=Development ENV ASPNETCORE_ENVIRONMENT=Development
ENV DOTNET_USE_POLLING_FILE_WATCHER=true ENV DOTNET_USE_POLLING_FILE_WATCHER=true

View File

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1-sdk FROM microsoft/dotnet:2.2-sdk
ARG BUILD_CONFIGURATION=Debug ARG BUILD_CONFIGURATION=Debug
ENV ASPNETCORE_ENVIRONMENT=Development ENV ASPNETCORE_ENVIRONMENT=Development
ENV DOTNET_USE_POLLING_FILE_WATCHER=true ENV DOTNET_USE_POLLING_FILE_WATCHER=true
@ -6,11 +6,9 @@ EXPOSE 80
WORKDIR /src WORKDIR /src
COPY ["src/Web/WebMVC/WebMVC.csproj", "src/Web/WebMVC/"] COPY ["src/Web/WebMVC/WebMVC.csproj", "src/Web/WebMVC/"]
COPY ["src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj", "src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/"]
COPY ["src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj", "src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/"]
RUN dotnet restore "src/Web/WebMVC/WebMVC.csproj" RUN dotnet restore "src/Web/WebMVC/WebMVC.csproj"
COPY . . COPY . .
WORKDIR "/src/src/Web/WebMVC" WORKDIR "/src/src/Web/WebMVC"
RUN dotnet build --no-restore -c $BUILD_CONFIGURATION RUN dotnet build --no-restore "WebMVC.csproj" -c $BUILD_CONFIGURATION
ENTRYPOINT ["dotnet", "run", "--no-restore", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"] ENTRYPOINT ["dotnet", "run", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

View File

@ -1,40 +1,39 @@
kind: helm-release kind: helm-release
apiVersion: 1.0 apiVersion: 1.1
build: build:
context: ..\..\..\ context: ..\..\..\
dockerfile: Dockerfile dockerfile: Dockerfile
install: install:
chart: ../../../k8s/helm/webmvc chart: ../../../k8s/helm/webmvc
values:
- values.dev.yaml?
- secrets.dev.yaml?
- inf.yaml
- app.yaml
set: set:
replicaCount: 1 replicaCount: 1
image: image:
tag: $(tag) tag: $(tag)
pullPolicy: Never pullPolicy: Never
inf:
k8s:
dns: "$(spacePrefix)webmvc$(hostSuffix)"
ingress: ingress:
annotations:
kubernetes.io/ingress.class: traefik-azds
hosts: hosts:
# This expands to [space.s.]webmvc.<guid>.<region>.aksapp.io # This expands to [space.s.]webmvc.<guid>.<region>.aksapp.io
- $(spacePrefix)webmvc$(hostSuffix) - $(spacePrefix)webmvc$(hostSuffix)
values:
- values.dev.yaml?
- secrets.dev.yaml?
- inf.yaml
- app.yaml
configurations: configurations:
develop: develop:
build: build:
dockerfile: Dockerfile.develop
useGitIgnore: true useGitIgnore: true
dockerfile: Dockerfile.develop
args: args:
BUILD_CONFIGURATION: ${BUILD_CONFIGURATION:-Debug} BUILD_CONFIGURATION: ${BUILD_CONFIGURATION:-Debug}
container: container:
sync: sync:
- "**/Pages/**" - '**/Pages/**'
- "**/Views/**" - '**/Views/**'
- "**/wwwroot/**" - '**/wwwroot/**'
- "!**/*.{sln,csproj}" - '!**/*.{sln,csproj}'
command: [dotnet, run, --no-restore, --no-build, --no-launch-profile, -c, "${BUILD_CONFIGURATION:-Debug}"] command: [dotnet, run, --no-restore, --no-build, --no-launch-profile, -c, "${BUILD_CONFIGURATION:-Debug}"]
iterate: iterate:
processesToKill: [dotnet, vsdbg] processesToKill: [dotnet, vsdbg]

View File

@ -19,6 +19,6 @@ inf:
ingress: ingress:
annotations: annotations:
kubernetes.io/ingress.class: addon-http-application-routing # kubernetes.io/ingress.class: addon-http-application-routing
ingress.kubernetes.io/ssl-redirect: "false" ingress.kubernetes.io/ssl-redirect: "false"
nginx.ingress.kubernetes.io/ssl-redirect: "false" nginx.ingress.kubernetes.io/ssl-redirect: "false"