Skip to content

Commit eed8681

Browse files
eiximeniseiximenis
committed
Merge branch 'test-devspaces' of https://github.com/dotnet-architecture/eShopOnContainers into features/devspaces
2 parents 0eae3c3 + 75e4a11 commit eed8681

30 files changed

Lines changed: 757 additions & 2 deletions

File tree

‎k8s/helm/webmvc/templates/configmap.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
{{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
33
{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
44
{{- $mvc := include "url-of" (list .Values.app.ingress.entries.mvc .) -}}
5-
{{- $mongo := include "mongo-name" . -}}
65

76

87
apiVersion: v1

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile.develop‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM microsoft/dotnet:2.1-sdk
2+
ENV ASPNETCORE_ENVIRONMENT=Development
3+
ENV DOTNET_USE_POLLING_FILE_WATCHER=true
4+
5+
EXPOSE 80
6+
7+
WORKDIR /src
8+
COPY ["src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj", "src/ApiGateways/Mobile.Bff.Shopping/aggregator/"]
9+
10+
RUN dotnet restore src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj -nowarn:msb3202,nu1503
11+
COPY . .
12+
WORKDIR "/src/src/ApiGateways/Mobile.Bff.Shopping/aggregator"
13+
RUN dotnet build --no-restore -c $BUILD_CONFIGURATION
14+
15+
CMD ["dotnet", "run", "--no-restore", "--no-build", "--no-launch-profile"]

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Properties/launchSettings.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
"ASPNETCORE_ENVIRONMENT": "Development"
2525
},
2626
"applicationUrl": "http://localhost:61632/"
27+
},
28+
"Azure Dev Spaces": {
29+
"commandName": "AzureDevSpaces",
30+
"launchBrowser": true,
31+
"resourceGroup": "eshoptestedu",
32+
"aksName": "eshoptestedu",
33+
"subscriptionId": "e3035ac1-c06c-4daf-8939-57b3c5f1f759"
2734
}
2835
}
2936
}

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/azds.yaml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
kind: helm-release
2+
apiVersion: 1.0
3+
build:
4+
context: ..\..\..\..
5+
dockerfile: Dockerfile
6+
install:
7+
chart: ../../../../k8s/helm/apigwms
8+
values:
9+
- values.dev.yaml?
10+
- secrets.dev.yaml?
11+
- ..\..\..\..\k8s\helm\app.yaml
12+
- ..\..\..\..\k8s\helm\inf.yaml
13+
set:
14+
image:
15+
tag: $(tag)
16+
pullPolicy: Never
17+
inf:
18+
k8s:
19+
dns: "$(spacePrefix)apigwms$(hostSuffix)"
20+
disableProbes: true
21+
ingress:
22+
hosts:
23+
# This expands to [space.s.]apigwms.<guid>.<region>.aksapp.io
24+
- $(spacePrefix)apigwms$(hostSuffix)
25+
configurations:
26+
develop:
27+
build:
28+
dockerfile: Dockerfile.develop
29+
useGitIgnore: true
30+
container:
31+
syncTarget: /src
32+
sync:
33+
- "**/Pages/**"
34+
- "**/Views/**"
35+
- "**/wwwroot/**"
36+
- "!**/*.{sln,csproj}"
37+
command: [dotnet, run, --no-restore, --no-build, --no-launch-profile, -c, "${Configuration:-Debug}"]
38+
iterate:
39+
processesToKill: [dotnet, vsdbg]
40+
buildCommands:
41+
- [dotnet, build, --no-restore, -c, "${Configuration:-Debug}"]

‎src/Services/Basket/Basket.API/.dockerignore‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.dockerignore
2+
.git
3+
.gitignore
4+
.vs
5+
.vscode
6+
**/*.*proj.user
7+
**/azds.yaml
8+
**/bin
9+
**/charts
10+
**/Dockerfile
11+
**/Dockerfile.develop
12+
**/obj
13+
**/secrets.dev.yaml
14+
**/values.dev.yaml

‎src/Services/Basket/Basket.API/Dockerfile.develop‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM microsoft/dotnet:2.1-sdk
2+
ARG BUILD_CONFIGURATION=Debug
3+
ENV ASPNETCORE_ENVIRONMENT=Development
4+
ENV DOTNET_USE_POLLING_FILE_WATCHER=true
5+
EXPOSE 80
6+
7+
WORKDIR /src
8+
9+
COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
10+
COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
11+
COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
12+
COPY ["src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj", "src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/"]
13+
COPY ["src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj", "src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/"]
14+
COPY ["src/Services/Basket/Basket.API/Basket.API.csproj", "src/Services/Basket/Basket.API/"]
15+
16+
RUN dotnet restore src/Services/Basket/Basket.API/Basket.API.csproj -nowarn:msb3202,nu1503
17+
COPY . .
18+
WORKDIR /src/src/Services/Basket/Basket.API
19+
RUN dotnet build --no-restore -c $BUILD_CONFIGURATION
20+
21+
CMD ["dotnet", "run", "--no-restore", "--no-build", "--no-launch-profile"]

‎src/Services/Basket/Basket.API/app.yaml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# This heml values file defines app-based settings
2+
# Charts use those values, so this file **MUST** be included in all chart releases
3+
4+
5+
app: # app global settings
6+
name: "my-eshop" # Override for custom app name
7+
ingress: # ingress related settings
8+
entries:
9+
basket: basket-api # ingress entry for basket api
10+
catalog: catalog-api # ingress entry for catalog api
11+
ordering: ordering-api # ingress entry for ordering api
12+
identity: identity # ingress entry for identity api
13+
mvc: webmvc # ingress entry for web mvc
14+
spa: "" # ingress entry for web spa
15+
status: webstatus # ingress entry for web status
16+
webshoppingapigw: webshoppingapigw # ingress entry for web shopping Agw
17+
webmarketingapigw: webmarketingapigw # ingress entry for web mkg Agw
18+
mobilemarketingapigw: mobilemarketingapigw # ingress entry for mobile mkg Agw
19+
mobileshoppingapigw: mobileshoppingapigw # ingress entry for mobile shopping Agw
20+
webshoppingagg: webshoppingagg # ingress entry for web shopping aggregator
21+
mobileshoppingagg: mobileshoppingagg # ingress entry for mobile shopping aggregator
22+
payment: payment-api # ingress entry for payment api
23+
locations: locations-api # ingress entry for locations api
24+
marketing: marketing-api # ingress entry for marketing api
25+
svc:
26+
basket: basket # service name for basket api
27+
catalog: catalog # service name for catalog api
28+
ordering: ordering # service name for ordering api
29+
orderingbackgroundtasks: orderingbackgroundtasks # service name for orderingbackgroundtasks
30+
orderingsignalrhub: orderingsignalrhub # service name for orderingsignalrhub
31+
identity: identity # service name for identity api
32+
mvc: webmvc # service name for web mvc
33+
spa: webspa # service name for web spa
34+
status: webstatus # service name for web status
35+
webshoppingapigw: webshoppingapigw # service name for web shopping Agw
36+
webmarketingapigw: webmarketingapigw # service name for web mkg Agw
37+
mobilemarketingapigw: mobilemarketingapigw # service name for mobile mkg Agw
38+
mobileshoppingapigw: mobileshoppingapigw # service name for mobile shopping Agw
39+
webshoppingagg: webshoppingagg # service name for web shopping aggregator
40+
mobileshoppingagg: mobileshoppingagg # service name for mobile shopping aggregator
41+
payment: payment # service name for payment api
42+
locations: locations # service name for locations api
43+
marketing: marketing # service name for marketing ap

‎src/Services/Basket/Basket.API/azds.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
kind: helm-release
2+
apiVersion: 1.0
3+
build:
4+
context: ..\..\..\..
5+
dockerfile: Dockerfile
6+
install:
7+
chart: ../../../../k8s/helm/basket-api
8+
values:
9+
- values.dev.yaml?
10+
- secrets.dev.yaml?
11+
- inf.yaml
12+
- app.yaml
13+
set:
14+
replicaCount: 1
15+
image:
16+
tag: $(tag)
17+
pullPolicy: Never
18+
ingress:
19+
hosts:
20+
# This expands to [space.s.]basketapi.<guid>.<region>.aksapp.io
21+
- $(spacePrefix)basketapi$(hostSuffix)
22+
configurations:
23+
develop:
24+
build:
25+
dockerfile: Dockerfile.develop
26+
useGitIgnore: true
27+
args:
28+
BUILD_CONFIGURATION: ${BUILD_CONFIGURATION:-Debug}
29+
container:
30+
sync:
31+
- "**/Pages/**"
32+
- "**/Views/**"
33+
- "**/wwwroot/**"
34+
- "!**/*.{sln,csproj}"
35+
command: [dotnet, run, --no-restore, --no-build, --no-launch-profile, -c, "${BUILD_CONFIGURATION:-Debug}"]
36+
iterate:
37+
processesToKill: [dotnet, vsdbg]
38+
buildCommands:
39+
- [dotnet, build, --no-restore, -c, "${BUILD_CONFIGURATION:-Debug}"]

‎src/Services/Basket/Basket.API/inf.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This heml values file defines all infrastructure used by eShopOnContainers.
2+
# It is used on all charts, so ** MUST BE INCLUDED ** on every deployment
3+
4+
inf:
5+
redis: # inf.redis defines the redis' connection strings
6+
basket:
7+
svc: basket-data # Name of k8s svc for basket redis
8+
constr: basket-data # Connection string to Redis used by Basket API
9+
eventbus:
10+
svc: rabbitmq # Name of k8s svc for rabbitmq
11+
constr: rabbitmq # Event bus connection string
12+
useAzure: false # true if use Azure Service Bus. False if RabbitMQ
13+
appinsights:
14+
key: "" # App insights to use
15+
k8s: {}
16+
misc: # inf.misc contains miscellaneous configuration related to infrastructure
17+
useLoadTest: false # If running under loading test or not
18+
useAzureStorage: false # If catalog api uses azure storage or not

‎src/Services/Catalog/Catalog.API/Dockerfile.develop‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
FROM microsoft/dotnet:2.1-sdk
2+
ENV ASPNETCORE_ENVIRONMENT=Development
3+
ENV DOTNET_USE_POLLING_FILE_WATCHER=true
4+
5+
EXPOSE 80
6+
7+
WORKDIR /src
8+
COPY ["eShopOnContainers-ServicesAndWebApps.sln", "./"]
9+
COPY ["src/BuildingBlocks/EventBus/EventBus/EventBus.csproj", "src/BuildingBlocks/EventBus/EventBus/"]
10+
COPY ["src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj", "src/BuildingBlocks/EventBus/EventBusRabbitMQ/"]
11+
COPY ["src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj", "src/BuildingBlocks/EventBus/EventBusServiceBus/"]
12+
COPY ["src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj", "src/BuildingBlocks/EventBus/IntegrationEventLogEF/"]
13+
COPY ["src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj", "src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/"]
14+
COPY ["src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj", "src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/"]
15+
COPY ["src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj", "src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/"]
16+
COPY ["src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj", "src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/"]
17+
COPY ["src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj", "src/BuildingBlocks/WebHostCustomization/WebHost.Customization/"]
18+
COPY ["src/Services/Catalog/Catalog.API/Catalog.API.csproj", "src/Services/Catalog/Catalog.API/"]
19+
20+
RUN dotnet restore src/Services/Catalog/Catalog.API/Catalog.API.csproj -nowarn:msb3202,nu1503
21+
COPY . .
22+
WORKDIR "/src/src/Services/Catalog/Catalog.API"
23+
RUN dotnet build "Catalog.API.csproj"
24+
25+
CMD ["dotnet", "run", "--no-restore", "--no-build", "--no-launch-profile"]

0 commit comments

Comments
 (0)