Skip to content

Commit cd8588b

Browse files
giovanninoccogiovanninocco
authored
Merge pull request #125 from Genocs/ver_700
Ver 700
2 parents 87258db + a8b8c4a commit cd8588b

File tree

102 files changed

+1270
-975
lines changed

Some content is hidden

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

102 files changed

+1270
-975
lines changed

‎README.md‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ You can use **Docker compose** to setup the infrastructure components just by ru
7373

7474
``` bash
7575
cd ./containers
76-
# Setup the infrastructure
76+
# Setup the infrastructure. Use this file to setup the basic infrastructure components (RabbitMQ, MongoDB)
7777
docker compose -f ./infrastructure.yml --env-file ./.env --project-name genocs up -d
7878

79-
# Use this file only in case you want to setup Redis and Postgres db (no need if you use mongo)
79+
# Use this file only in case you want to setup Redis and PostgreSQL (no need if you use MongoDB)
8080
docker compose -f ./infrastructure-db.yml --env-file ./.env --project-name genocs up -d
8181

8282
# Use this file only in case you want to setup monitoring infrastructure components (Prometheus, Grafana, InfluxDB, Jaeger, Seq)
@@ -88,13 +88,13 @@ docker compose -f ./infrastructure-scaling.yml --env-file ./.env --project-name
8888
# Use this file only in case you want to setup security infrastructure components (Vault)
8989
docker compose -f ./infrastructure-security.yml --env-file ./.env --project-name genocs up -d
9090

91-
# Use this file only in case you want to setup sqlserver database (no need if you use postgres)
91+
# Use this file only in case you want to setup sqlserver database (no need if you use PostgreSQL)
9292
docker compose -f ./infrastructure-sqlserver.yml --env-file ./.env --project-name genocs up -d
9393

94-
# Use this file only in case you want to setup mySql database (no need if you use postgres)
94+
# Use this file only in case you want to setup mySql database (no need if you use PostgreSQL)
9595
docker compose -f ./infrastructure-mysql.yml --env-file ./.env --project-name genocs up -d
9696

97-
# Use this file only in case you want to setup oracle database (no need if you use postgres)
97+
# Use this file only in case you want to setup oracle database (no need if you use PostgreSQL)
9898
docker compose -f ./infrastructure-oracle.yml --env-file ./.env --project-name genocs up -d
9999

100100
# Use this file only in case you want to setup elk stack
@@ -104,18 +104,24 @@ docker compose -f ./infrastructure-elk.yml --env-file ./.env --project-name geno
104104
docker compose -f ./infrastructure-ml.yml --env-file ./.env --project-name genocs up -d
105105
```
106106

107-
`infrastructure-bare.yml` allows to install the basic infrastructure components. They are:
107+
`infrastructure.yml` allows to install the basic infrastructure components. They are:
108108
- [RabbitMQ](https://rabbitmq.com)
109109
- [Redis](https://redis.io)
110110
- [MongoDB](https://mongodb.com)
111-
- [Postgres](https://www.postgresql.org/).
111+
- [Postgres](https://www.postgresql.org/)
112112

113-
You can run them locally:
113+
114+
`infrastructure-db.yml` allows to install Redis and PostgreSQL
115+
- [Redis](https://redis.io)
116+
- [Postgres](https://www.postgresql.org/)
117+
118+
119+
You can check them locally:
114120

115121
- [RabbitMQ](http://localhost:15672): `localhost:15672`
116-
- Redis: `localhost:6379`
117-
- MongoDB: `localhost:27017`
118-
- Postgres: `localhost:5432`
122+
- Redis: `TCP:localhost:6379`
123+
- MongoDB: `TCP:localhost:27017`
124+
- Postgres: `TCP:localhost:5432`
119125

120126

121127
`infrastructure-monitoring.yml` allows to install the monitoring infrastructure components. They are:
@@ -126,7 +132,7 @@ You can run them locally:
126132
- [Seq](https://datalust.co/seq)
127133

128134

129-
You can run them locally:
135+
You can find the console locally at:
130136

131137
- [Prometheus](localhost:9090): `localhost:9090`
132138
- [Grafana](localhost:3000): `localhost:3000`
@@ -135,9 +141,13 @@ You can run them locally:
135141
- [Seq](localhost:5341): `localhost:5341`
136142

137143

138-
`infrastructure-scaling.yml` allows to install the scaling infrastructure components. They are:
139-
- Fabio
140-
- Consul
144+
`infrastructure-scaling.yml` allows to install the scaling infrastructure components composed by Fabio and Consul.
145+
146+
- [Fabio](https://fabiolb.net/)
147+
- [Consul](https://www.consul.io/)
148+
149+
150+
141151

142152
`infrastructure-security.yml` allows to install the security infrastructure components.
143153

@@ -185,7 +195,7 @@ Use [**api-workbench**](./api-workbench.rest) inside Visual Studio code with [RE
185195
"enabled": false,
186196
"url": "http://localhost:8500",
187197
"service": "demo-service",
188-
"address": "docker.for.win.localhost",
198+
"address": "docker.for.mac.localhost",
189199
"port": "5070",
190200
"pingEnabled": true,
191201
"pingEndpoint": "health",

‎containers/.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This file is a template for the .env file that is used by the docker-compose.yml file.
2+
POSTGRES_PASSWORD=mySecretPassword1234!

‎genocs.sln‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,11 @@ EndProject
120120
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{B184733D-2415-4517-BC65-26ED22EEB2C2}"
121121
ProjectSection(SolutionItems) = preProject
122122
src\apps\apigateway.dockerfile = src\apps\apigateway.dockerfile
123-
src\apps\application-docker-compose.yml = src\apps\application-docker-compose.yml
123+
src\apps\docker-compose.override.yml = src\apps\docker-compose.override.yml
124+
src\apps\docker-compose.yml = src\apps\docker-compose.yml
124125
src\apps\identity-webapi.dockerfile = src\apps\identity-webapi.dockerfile
125126
src\apps\order-webapi.dockerfile = src\apps\order-webapi.dockerfile
127+
src\apps\local.env = src\apps\local.env
126128
src\apps\product-webapi.dockerfile = src\apps\product-webapi.dockerfile
127129
src\apps\signalr-webapi.dockerfile = src\apps\signalr-webapi.dockerfile
128130
EndProjectSection

‎src/Genocs.Auth/Genocs.Auth.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
</ItemGroup>
2525

2626
<ItemGroup Condition="'$(Configuration)' == 'Release'">
27-
<PackageReference Include="Genocs.Core" Version="7.0.0" />
28-
<PackageReference Include="Genocs.Security" Version="7.0.0" />
27+
<PackageReference Include="Genocs.Core" Version="7.1.0" />
28+
<PackageReference Include="Genocs.Security" Version="7.1.0" />
2929
</ItemGroup>
3030

3131
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">

‎src/Genocs.Core.Demo.Contracts/Genocs.Core.Demo.Contracts.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup Condition="'$(Configuration)' == 'Release'">
14-
<PackageReference Include="Genocs.Core" Version="7.0.0" />
14+
<PackageReference Include="Genocs.Core" Version="7.1.0" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/Genocs.Core.Demo.Domain/Genocs.Core.Demo.Domain.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</ItemGroup>
1313

1414
<ItemGroup Condition="'$(Configuration)' == 'Release'">
15-
<PackageReference Include="Genocs.Persistence.MongoDb" Version="7.0.0" />
16-
<PackageReference Include="Genocs.Core" Version="7.0.0" />
15+
<PackageReference Include="Genocs.Persistence.MongoDb" Version="7.1.0" />
16+
<PackageReference Include="Genocs.Core" Version="7.1.0" />
1717
</ItemGroup>
1818

1919
</Project>

‎src/Genocs.Core.Demo.WebApi/Genocs.Core.Demo.WebApi.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@
2020
</ItemGroup>
2121

2222
<ItemGroup Condition="'$(Configuration)' == 'Release'">
23-
<PackageReference Include="Genocs.ServiceBusAzure" Version="7.0.0" />
24-
<PackageReference Include="Genocs.Auth" Version="7.0.0" />
25-
<PackageReference Include="Genocs.Logging" Version="7.0.0" />
26-
<PackageReference Include="Genocs.Tracing" Version="7.0.0" />
27-
<PackageReference Include="Genocs.HTTP" Version="7.0.0" />
28-
<PackageReference Include="Genocs.Security" Version="7.0.0" />
29-
<PackageReference Include="Genocs.WebApi" Version="7.0.0" />
30-
<PackageReference Include="Genocs.WebApi.Security" Version="7.0.0" />
31-
<PackageReference Include="Genocs.Secrets.AzureKeyVault" Version="7.0.0" />
23+
<PackageReference Include="Genocs.ServiceBusAzure" Version="7.1.0" />
24+
<PackageReference Include="Genocs.Auth" Version="7.1.0" />
25+
<PackageReference Include="Genocs.Logging" Version="7.1.0" />
26+
<PackageReference Include="Genocs.Tracing" Version="7.1.0" />
27+
<PackageReference Include="Genocs.HTTP" Version="7.1.0" />
28+
<PackageReference Include="Genocs.Security" Version="7.1.0" />
29+
<PackageReference Include="Genocs.WebApi" Version="7.1.0" />
30+
<PackageReference Include="Genocs.WebApi.Security" Version="7.1.0" />
31+
<PackageReference Include="Genocs.Secrets.AzureKeyVault" Version="7.1.0" />
3232
</ItemGroup>
3333

3434
<ItemGroup>
3535
<PackageReference Include="MassTransit.RabbitMQ" Version="8.3.2" />
3636
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="9.0.0" />
3737
<PackageReference Include="Polly" Version="8.5.0" />
38-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
38+
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

‎src/Genocs.Core.Demo.WebApi/Program.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
.UseAzureKeyVault()
2121
.UseLogging();
2222

23-
var services = builder.Services;
24-
25-
services
26-
.AddGenocs(builder.Configuration)
23+
builder.AddGenocs()
2724
.AddJwt()
2825
// .AddOpenIdJwt()
2926
.AddOpenTelemetry()
@@ -32,6 +29,8 @@
3229
.AddApplicationServices()
3330
.Build();
3431

32+
var services = builder.Services;
33+
3534
services.AddCors();
3635
services.AddControllers().AddJsonOptions(x =>
3736
{

‎src/Genocs.Core.Demo.Worker/Genocs.Core.Demo.Worker.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
</ItemGroup>
1515

1616
<ItemGroup Condition="'$(Configuration)' == 'Release'">
17-
<PackageReference Include="Genocs.ServiceBusAzure" Version="7.0.0" />
18-
<PackageReference Include="Genocs.Logging" Version="7.0.0" />
19-
<PackageReference Include="Genocs.Tracing" Version="7.0.0" />
17+
<PackageReference Include="Genocs.ServiceBusAzure" Version="7.1.0" />
18+
<PackageReference Include="Genocs.Logging" Version="7.1.0" />
19+
<PackageReference Include="Genocs.Tracing" Version="7.1.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/Genocs.Core.Demo.Worker/appsettings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
"enabled": false,
4444
"url": "http://localhost:8500",
4545
"service": "users-service",
46-
"address": "docker.for.win.localhost",
46+
"address": "docker.for.mac.localhost",
4747
"port": "5070",
4848
"pingEnabled": true,
49-
"pingEndpoint": "ping",
49+
"pingEndpoint": "healthz",
5050
"pingInterval": 3,
5151
"removeAfterInterval": 3
5252
},
@@ -99,7 +99,7 @@
9999
"interval": "day"
100100
},
101101
"seq": {
102-
"enabled": false,
102+
"enabled": true,
103103
"url": "http://localhost:5341",
104104
"apiKey": "secret"
105105
},

0 commit comments

Comments
 (0)