From 5d88cfccdd58a254ce77dd4bb0c3ef0f312ba2d4 Mon Sep 17 00:00:00 2001 From: Pc Date: Thu, 4 Apr 2024 17:04:41 +0330 Subject: [PATCH] feat: Update docker image versions --- .../docker-compose/docker-compose.yaml | 10 ++--- .../docker-compose/infrastructure.yaml | 10 ++--- src/BuildingBlocks/BuildingBlocks.csproj | 44 ++++--------------- src/BuildingBlocks/TestBase/TestContainers.cs | 6 +-- .../Booking/src/Booking/Booking.csproj | 12 ++--- .../Flight/src/Flight.Api/Flight.Api.csproj | 6 --- .../Flight/tests/UnitTest/Unit.Test.csproj | 4 -- .../Passenger/src/Passenger/Passenger.csproj | 1 - 8 files changed, 26 insertions(+), 67 deletions(-) diff --git a/deployments/docker-compose/docker-compose.yaml b/deployments/docker-compose/docker-compose.yaml index a4e0a0e6..a8f20c17 100644 --- a/deployments/docker-compose/docker-compose.yaml +++ b/deployments/docker-compose/docker-compose.yaml @@ -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 diff --git a/deployments/docker-compose/infrastructure.yaml b/deployments/docker-compose/infrastructure.yaml index 61ce4b23..16ea0b8f 100644 --- a/deployments/docker-compose/infrastructure.yaml +++ b/deployments/docker-compose/infrastructure.yaml @@ -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 diff --git a/src/BuildingBlocks/BuildingBlocks.csproj b/src/BuildingBlocks/BuildingBlocks.csproj index 17089fd1..55f078b3 100644 --- a/src/BuildingBlocks/BuildingBlocks.csproj +++ b/src/BuildingBlocks/BuildingBlocks.csproj @@ -12,20 +12,24 @@ + + + + + + - - @@ -34,18 +38,12 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - @@ -55,12 +53,11 @@ - + - @@ -76,12 +73,6 @@ - - - - - - @@ -97,12 +88,8 @@ - - - - @@ -112,26 +99,21 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + @@ -140,12 +122,4 @@ - - - - - - - - diff --git a/src/BuildingBlocks/TestBase/TestContainers.cs b/src/BuildingBlocks/TestBase/TestContainers.cs index 6b68c350..2fdafb82 100644 --- a/src/BuildingBlocks/TestBase/TestContainers.cs +++ b/src/BuildingBlocks/TestBase/TestContainers.cs @@ -114,7 +114,7 @@ public sealed class RabbitMqContainerOptions 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 sealed class MongoContainerOptions { 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 sealed class EventStoreContainerOptions { 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"; } } diff --git a/src/Services/Booking/src/Booking/Booking.csproj b/src/Services/Booking/src/Booking/Booking.csproj index ad28c22c..05cd6624 100644 --- a/src/Services/Booking/src/Booking/Booking.csproj +++ b/src/Services/Booking/src/Booking/Booking.csproj @@ -6,6 +6,10 @@ enable + + + + all @@ -17,17 +21,9 @@ - - - - - - - - diff --git a/src/Services/Flight/src/Flight.Api/Flight.Api.csproj b/src/Services/Flight/src/Flight.Api/Flight.Api.csproj index 7eb9df10..6ad973f3 100644 --- a/src/Services/Flight/src/Flight.Api/Flight.Api.csproj +++ b/src/Services/Flight/src/Flight.Api/Flight.Api.csproj @@ -10,10 +10,4 @@ - - - Always - - - diff --git a/src/Services/Flight/tests/UnitTest/Unit.Test.csproj b/src/Services/Flight/tests/UnitTest/Unit.Test.csproj index c1e64047..0be3ce9f 100644 --- a/src/Services/Flight/tests/UnitTest/Unit.Test.csproj +++ b/src/Services/Flight/tests/UnitTest/Unit.Test.csproj @@ -22,8 +22,4 @@ - - - - diff --git a/src/Services/Passenger/src/Passenger/Passenger.csproj b/src/Services/Passenger/src/Passenger/Passenger.csproj index 0b369583..ee36449e 100644 --- a/src/Services/Passenger/src/Passenger/Passenger.csproj +++ b/src/Services/Passenger/src/Passenger/Passenger.csproj @@ -16,7 +16,6 @@ -