Browse Source

updated files to new devspaces format

pull/1004/head
eiximenis 6 years ago
parent
commit
820330556b
8 changed files with 22 additions and 25 deletions
  1. +1
    -1
      src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile.develop
  2. +1
    -1
      src/Services/Basket/Basket.API/Dockerfile.develop
  3. +1
    -1
      src/Services/Catalog/Catalog.API/Dockerfile.develop
  4. +1
    -1
      src/Services/Identity/Identity.API/Dockerfile.develop
  5. +1
    -1
      src/Services/Ordering/Ordering.API/Dockerfile.develop
  6. +3
    -5
      src/Web/WebMVC/Dockerfile.develop
  7. +13
    -14
      src/Web/WebMVC/azds.yaml
  8. +1
    -1
      src/Web/WebMVC/inf.yaml

+ 1
- 1
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile.develop View File

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


+ 1
- 1
src/Services/Basket/Basket.API/Dockerfile.develop View File

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


+ 1
- 1
src/Services/Catalog/Catalog.API/Dockerfile.develop View File

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


+ 1
- 1
src/Services/Identity/Identity.API/Dockerfile.develop View File

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


+ 1
- 1
src/Services/Ordering/Ordering.API/Dockerfile.develop View File

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


+ 3
- 5
src/Web/WebMVC/Dockerfile.develop View File

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1-sdk
FROM microsoft/dotnet:2.2-sdk
ARG BUILD_CONFIGURATION=Debug
ENV ASPNETCORE_ENVIRONMENT=Development
ENV DOTNET_USE_POLLING_FILE_WATCHER=true
@ -6,11 +6,9 @@ EXPOSE 80
WORKDIR /src
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"
COPY . .
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", "--"]

+ 13
- 14
src/Web/WebMVC/azds.yaml View File

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


+ 1
- 1
src/Web/WebMVC/inf.yaml View File

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

Loading…
Cancel
Save