Skip to content

Commit 152bc9f

Browse files
committed
Merge new creation ordering workflow
2 parents 34badc7 + 51c25c9 commit 152bc9f

175 files changed

Lines changed: 4222 additions & 569 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docker-compose.override.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ version: '2'
77
# An external IP or DNS name has to be used (instead localhost and the 10.0.75.1 IP) when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance.
88

99
services:
10-
10+
graceperiodmanager:
11+
environment:
12+
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
13+
- EventBusConnection=rabbitmq
14+
1115
basket.api:
1216
environment:
1317
- ASPNETCORE_ENVIRONMENT=Development
@@ -109,6 +113,14 @@ services:
109113
ports:
110114
- "5107:80"
111115

116+
payment.api:
117+
environment:
118+
- ASPNETCORE_ENVIRONMENT=Development
119+
- ASPNETCORE_URLS=http://0.0.0.0:5108
120+
- EventBusConnection=rabbitmq
121+
ports:
122+
- "5108:80"
123+
112124
locations.api:
113125
environment:
114126
- ASPNETCORE_ENVIRONMENT=Development
@@ -118,4 +130,4 @@ services:
118130
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
119131
- EventBusConnection=rabbitmq
120132
ports:
121-
- "5109:80"
133+
- "5109:80"

docker-compose.vs.debug.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,34 @@ services:
122122
labels:
123123
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
124124

125+
payment.api:
126+
image: eshop/payment.api:dev
127+
build:
128+
args:
129+
source: ${DOCKER_BUILD_SOURCE}
130+
environment:
131+
- DOTNET_USE_POLLING_FILE_WATCHER=1
132+
volumes:
133+
- ./src/Services/Payment/Payment.API:/app
134+
- ~/.nuget/packages:/root/.nuget/packages:ro
135+
- ~/clrdbg:/clrdbg:ro
136+
entrypoint: tail -f /dev/null
137+
labels:
138+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
139+
140+
graceperiodmanager:
141+
image: eshop/graceperiodmanager:dev
142+
build:
143+
args:
144+
source: ${DOCKER_BUILD_SOURCE}
145+
volumes:
146+
- ./src/Services/GracePeriod/GracePeriodManager:/app
147+
- ~/.nuget/packages:/root/.nuget/packages:ro
148+
- ~/clrdbg:/clrdbg:ro
149+
entrypoint: tail -f /dev/null
150+
labels:
151+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
152+
125153
locations.api:
126154
image: eshop/locations.api:dev
127155
build:

docker-compose.vs.release.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,26 @@ services:
8181
labels:
8282
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
8383

84+
payment.api:
85+
build:
86+
args:
87+
source: ${DOCKER_BUILD_SOURCE}
88+
volumes:
89+
- ~/clrdbg:/clrdbg:ro
90+
entrypoint: tail -f /dev/null
91+
labels:
92+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
93+
94+
graceperiodmanager:
95+
build:
96+
args:
97+
source: ${DOCKER_BUILD_SOURCE}
98+
volumes:
99+
- ~/clrdbg:/clrdbg:ro
100+
entrypoint: tail -f /dev/null
101+
labels:
102+
- "com.microsoft.visualstudio.targetoperatingsystem=linux"
103+
84104
locations.api:
85105
build:
86106
args:

docker-compose.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
version: '2'
22

3+
34
services:
5+
graceperiodmanager:
6+
image: eshop/graceperiodmanager
7+
build:
8+
context: ./src/Services/GracePeriod/GracePeriodManager
9+
dockerfile: Dockerfile
10+
depends_on:
11+
- sql.data
12+
- rabbitmq
13+
414
basket.api:
515
image: eshop/basket.api
616
build:
@@ -9,7 +19,6 @@ services:
919
depends_on:
1020
- basket.data
1121
- identity.api
12-
- rabbitmq
1322

1423
catalog.api:
1524
image: eshop/catalog.api
@@ -35,6 +44,7 @@ services:
3544
dockerfile: Dockerfile
3645
depends_on:
3746
- sql.data
47+
- rabbitmq
3848

3949
marketing.api:
4050
image: eshop/marketing.api
@@ -85,12 +95,20 @@ services:
8595
image: eshop/webstatus
8696
build:
8797
context: ./src/Web/WebStatus
88-
dockerfile: Dockerfile
98+
dockerfile: Dockerfile
99+
100+
payment.api:
101+
image: eshop/payment.api
102+
build:
103+
context: ./src/Services/Payment/Payment.API
104+
dockerfile: Dockerfile
105+
depends_on:
106+
- rabbitmq
89107

90108
locations.api:
91109
image: locations.api
92110
build:
93111
context: ./src/Services/Location/Locations.API
94112
dockerfile: Dockerfile
95113
depends_on:
96-
- nosql.data
114+
- nosql.data

eShopOnContainers-ServicesAndWebApps.sln

Lines changed: 159 additions & 55 deletions
Large diffs are not rendered by default.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard1.4</TargetFramework>
5+
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.CommandBus</RootNamespace>
6+
</PropertyGroup>
7+
8+
</Project>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
using System.Threading.Tasks;
5+
6+
namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
7+
{
8+
public interface ICommandBus
9+
{
10+
Task SendAsync<T>(T command) where T : IntegrationCommand;
11+
12+
}
13+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
6+
{
7+
public abstract class IntegrationCommand
8+
{
9+
public Guid Id { get; private set; }
10+
public DateTime Sent { get; private set; }
11+
12+
protected IntegrationCommand()
13+
{
14+
Id = Guid.NewGuid();
15+
Sent = DateTime.UtcNow;
16+
}
17+
}
18+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard1.4</TargetFramework>
5+
</PropertyGroup>
6+
7+
</Project>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard1.0</TargetFramework>
5+
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.CommandBus</RootNamespace>
6+
</PropertyGroup>
7+
8+
</Project>

0 commit comments

Comments
 (0)