elias/booking-microservices
1
0
Fork 0
mirror of https://github.com/meysamhadeli/booking-microservices.git synced 2026-04-11 10:32:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Update docker image versions

Browse Source
This commit is contained in:
Pc 2024-04-04 17:04:41 +03:30
parent ccd6fccc7f
commit 5d88cfccdd
8 changed files with 26 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployments/docker-compose/docker-compose.yaml
View File

@ -43,7 +43,7 @@ services:
#######################################################
rabbitmq:
container_name: rabbitmq
image: rabbitmq:3-management
image: rabbitmq:management
restart: unless-stopped
ports:
- 5672:5672
@ -76,7 +76,7 @@ services:
#######################################################
eventstore:
container_name: eventstore
image: eventstore/eventstore:21.2.0-buster-slim
image: eventstore/eventstore:latest
restart: unless-stopped
environment:
- EVENTSTORE_CLUSTER_SIZE=1
@ -98,7 +98,7 @@ services:
# Mongo
#######################################################
mongo:
image: mongo:5
image: mongo:latest
container_name: mongo
restart: unless-stopped
# environment:
@ -114,7 +114,7 @@ services:
#######################################################
elasticsearch:
container_name: elasticsearch
image: elasticsearch:7.17.9
image: elasticsearch:latest
restart: unless-stopped
ports:
- 9200:9200
@ -133,7 +133,7 @@ services:
#######################################################
kibana:
container_name: kibana
image: kibana:7.17.9
image: kibana:latest
restart: unless-stopped
ports:
- 5601:5601

10
deployments/docker-compose/infrastructure.yaml
View File

@ -6,7 +6,7 @@ services:
#######################################################
rabbitmq:
container_name: rabbitmq
image: rabbitmq:3-management
image: rabbitmq:management
restart: unless-stopped
ports:
- 5672:5672
@ -77,7 +77,7 @@ services:
eventstore:
container_name: eventstore
image: eventstore/eventstore:21.2.0-buster-slim
image: eventstore/eventstore:latest
restart: unless-stopped
environment:
- EVENTSTORE_CLUSTER_SIZE=1
@ -99,7 +99,7 @@ services:
# Mongo
#######################################################
mongo:
image: mongo:5
image: mongo:latest
container_name: mongo
restart: unless-stopped
# environment:
@ -116,7 +116,7 @@ services:
#######################################################
elasticsearch:
container_name: elasticsearch
image: elasticsearch:7.17.9
image: elasticsearch:latest
restart: unless-stopped
ports:
- 9200:9200
@ -135,7 +135,7 @@ services:
#######################################################
kibana:
container_name: kibana
image: kibana:7.17.9
image: kibana:latest
restart: unless-stopped
ports:
- 5601:5601

44
src/BuildingBlocks/BuildingBlocks.csproj
View File

@ -12,20 +12,24 @@
<PackageReference Include="Asp.Versioning.Http" Version="8.1.0" />
<PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.Elasticsearch" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.EventStore" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.SQLite.Storage" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="8.0.1" />
<PackageReference Include="Grpc.Core.Testing" Version="2.46.6" />
<PackageReference Include="EasyCaching.Core" Version="1.9.2" />
<PackageReference Include="EasyCaching.InMemory" Version="1.9.2" />
<PackageReference Include="EasyNetQ.Management.Client" Version="2.0.0" />
<PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
<PackageReference Include="EntityFrameworkCore.Triggered" Version="3.2.2" />
<PackageReference Include="Figgle" Version="0.5.1" />
<PackageReference Include="FluentValidation" Version="11.9.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="Grpc.Core.Testing" Version="2.46.6" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
@ -34,18 +38,12 @@
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
<PackageReference Include="Polly" Version="8.3.1" />
<PackageReference Include="protobuf-net.BuildTools" Version="3.2.33">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="IdGen" Version="3.0.5" />
<PackageReference Include="Mapster" Version="7.4.0" />
<PackageReference Include="Mapster.DependencyInjection" Version="1.0.1" />
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
@ -55,12 +53,11 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="MongoDB.Driver" Version="2.24.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="OpenTelemetry.Contrib.Instrumentation.MassTransit" Version="1.0.0-beta2" />
<PackageReference Include="Scrutor" Version="4.2.2" />
<PackageReference Include="Scrutor.AspNetCore" Version="3.3.0" />
<PackageReference Include="Sentry.Serilog" Version="4.2.1" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
@ -76,12 +73,6 @@
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="8.0.1" />
<PackageReference Include="System.Interactive.Async" Version="6.0.1" />
<PackageReference Include="MassTransit" Version="8.2.0" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.2.0" />
<PackageReference Include="Duende.IdentityServer" Version="7.0.3" />
@ -97,12 +88,8 @@
<PackageReference Include="Testcontainers.PostgreSql" Version="3.8.0" />
<PackageReference Include="Testcontainers.RabbitMq" Version="3.8.0" />
<PackageReference Include="Unchase.Swashbuckle.AspNetCore.Extensions" Version="2.7.1" />
<PackageReference Include="WebMotions.Fake.Authentication.JwtBearer" Version="8.0.1" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.17.4" />
<PackageReference Include="Jaeger" Version="1.0.3" />
<PackageReference Include="OpenTracing" Version="0.12.1" />
<PackageReference Include="prometheus-net" Version="8.2.1" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
@ -112,26 +99,21 @@
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.2.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
<PackageReference Include="AutoBogus" Version="2.13.1" />
<PackageReference Include="Bogus" Version="35.5.0" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Respawn" Version="6.2.1" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3" />
<PackageReference Include="WebMotions.Fake.Authentication.JwtBearer" Version="8.0.1" />
<PackageReference Include="Google.Protobuf" Version="3.26.1" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.62.0" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28" />
<PackageReference Update="Meziantou.Analyzer" Version="2.0.146" />
<PackageReference Update="AsyncFixer" Version="1.6.0" />
<PackageReference Update="Roslynator.Analyzers" Version="4.12.0" />
@ -140,12 +122,4 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Contracts" />
<Folder Include="Core\Pagination" />
<Folder Include="EventStoreDB\BackgroundWorkers" />
<Folder Include="PersistMessageProcessor\Data\Configurations" />
</ItemGroup>
</Project>

6
src/BuildingBlocks/TestBase/TestContainers.cs
View File

@ -114,7 +114,7 @@ public static class TestContainers
public string Name { get; set; } = "rabbitmq_" + Guid.NewGuid();
public int Port { get; set; } = 5672;
public int ApiPort { get; set; } = 15672;
public string ImageName { get; set; } = "rabbitmq:3-management";
public string ImageName { get; set; } = "rabbitmq:management";
public string UserName { get; set; } = "guest";
public string Password { get; set; } = "guest";
}
@ -141,7 +141,7 @@ public static class TestContainers
{
public string Name { get; set; } = "mongo_" + Guid.NewGuid().ToString("D");
public int Port { get; set; } = 27017;
public string ImageName { get; set; } = "mongo:5";
public string ImageName { get; set; } = "mongo:latest";
public string UserName { get; set; } = Guid.NewGuid().ToString("D");
public string Password { get; set; } = Guid.NewGuid().ToString("D");
}
@ -150,6 +150,6 @@ public static class TestContainers
{
public string Name { get; set; } = "event_store_" + Guid.NewGuid().ToString("D");
public int Port { get; set; } = 2113;
public string ImageName { get; set; } = "eventstore/eventstore:21.2.0-buster-slim";
public string ImageName { get; set; } = "eventstore/eventstore:latest";
}
}

12
src/Services/Booking/src/Booking/Booking.csproj
View File

@ -6,6 +6,10 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Grpc.Tools" Version="2.62.0">
<PrivateAssets>all</PrivateAssets>
@ -17,17 +21,9 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
</ItemGroup>
<ItemGroup>
<Protobuf Include="GrpcClient\Protos\flight.proto" GrpcServices="Both" />
<Protobuf Include="GrpcClient\Protos\passenger.proto" GrpcServices="Both" />
</ItemGroup>
<ItemGroup>
<Folder Include="GrpcClient\Protos" />
</ItemGroup>

6
src/Services/Flight/src/Flight.Api/Flight.Api.csproj
View File

@ -10,10 +10,4 @@
<ProjectReference Include="..\Flight\Flight.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="appsettings.test.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

4
src/Services/Flight/tests/UnitTest/Unit.Test.csproj
View File

@ -22,8 +22,4 @@
<ProjectReference Include="..\..\src\Flight.Api\Flight.Api.csproj" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="Flight" />
</ItemGroup>
</Project>

1
src/Services/Passenger/src/Passenger/Passenger.csproj
View File

@ -16,7 +16,6 @@
<ItemGroup>
<Folder Include="Data\Migrations" />
<Folder Include="Identity\Consumers" />
</ItemGroup>
<ItemGroup>