elias/booking-microservices
1
0
Fork 0
mirror of https://github.com/meysamhadeli/booking-microservices.git synced 2026-04-17 16:36:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Change in docker files config

Browse Source
This commit is contained in:
meysamhadeli 2023-01-04 02:17:36 +03:30
parent 624194bb01
commit c4748908b9
19 changed files with 46 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ services:
- "5001:80"
- "5000:443"
depends_on:
- db
- sql
- rabbitmq
- jaeger
- elasticsearch
@ -47,7 +47,7 @@ services:
- 5004:80
- 5003:443
depends_on:
- db
- sql
- rabbitmq
- jaeger
- elasticsearch
@ -79,7 +79,7 @@ services:
- 6005:80
- 5005:443
depends_on:
- db
- sql
- rabbitmq
- jaeger
- elasticsearch
@ -110,7 +110,7 @@ services:
- 6012:80
- 5012:443
depends_on:
- db
- sql
- rabbitmq
- jaeger
- elasticsearch
@ -142,10 +142,10 @@ services:
- 6010:80
- 5010:443
depends_on:
- db
- sql
- rabbitmq
- jaeger
- eventstore.db
- eventstore
- elasticsearch
- kibana
- mongo
@ -163,8 +163,8 @@ services:
#######################################################
# SqlServer
#######################################################
db:
container_name: sqldb
sql:
container_name: sql
image: mcr.microsoft.com/mssql/server:2022-latest
restart: unless-stopped
ports:
@ -196,8 +196,8 @@ services:
# Rabbitmq
#######################################################
rabbitmq:
image: rabbitmq:3-management
container_name: rabbitmq
image: rabbitmq:3-management
restart: unless-stopped
ports:
- 5672:5672
@ -228,7 +228,8 @@ services:
#######################################################
# EventStoreDB
#######################################################
eventstore.db:
eventstore:
container_name: eventstore
image: eventstore/eventstore:21.2.0-buster-slim
restart: on-failure
environment:
@ -251,7 +252,7 @@ services:
# Mongo
#######################################################
mongo:
image: mongo:4
image: mongo:5
container_name: mongo
restart: unless-stopped
# environment:
@ -261,9 +262,6 @@ services:
- booking
ports:
- 27017:27017
volumes:
- mongo:/data/db
#######################################################
# Elastic Search
@ -310,8 +308,6 @@ networks:
volumes:
db-data:
external: false
mongo:
driver: local
elasticsearch-data:

17
deployments/docker-compose/infrastracture.yaml
View File

@ -5,8 +5,8 @@ services:
# Rabbitmq
#######################################################
rabbitmq:
image: rabbitmq:3-management
container_name: rabbitmq
image: rabbitmq:3-management
restart: unless-stopped
ports:
- 5672:5672
@ -18,8 +18,8 @@ services:
#######################################################
# SqlServer
#######################################################
db:
container_name: sqldb
sql:
container_name: sql
image: mcr.microsoft.com/mssql/server:2022-latest
restart: unless-stopped
ports:
@ -50,8 +50,8 @@ services:
# Jaeger
#######################################################
jaeger:
image: jaegertracing/all-in-one
container_name: jaeger
image: jaegertracing/all-in-one
restart: unless-stopped
networks:
- booking
@ -68,7 +68,8 @@ services:
#######################################################
# EventStoreDB
#######################################################
eventstore.db:
eventstore:
container_name: eventstore
image: eventstore/eventstore:21.2.0-buster-slim
restart: on-failure
environment:
@ -91,7 +92,7 @@ services:
# Mongo
#######################################################
mongo:
image: mongo:4
image: mongo:5
container_name: mongo
restart: unless-stopped
# environment:
@ -101,8 +102,6 @@ services:
- booking
ports:
- 27017:27017
volumes:
- mongo:/data/db
#######################################################
@ -162,8 +161,6 @@ networks:
volumes:
db-data:
external: false
mongo:
driver: local
elasticsearch-data:

3
src/BuildingBlocks/PersistMessageProcessor/Data/DesignTimeDbContextFactory.cs
View File

@ -9,8 +9,7 @@ public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<PersistMes
{
var builder = new DbContextOptionsBuilder<PersistMessageDbContext>();
builder.UseSqlServer(
"Data Source=.\\sqlexpress;Initial Catalog=PersistMessageDB;Persist Security Info=False;Integrated Security=SSPI;TrustServerCertificate=True");
builder.UseSqlServer("Server=localhost;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True");
return new PersistMessageDbContext(builder.Options);
}
}

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

@ -48,7 +48,7 @@ public static class TestContainers
Username = Guid.NewGuid().ToString("D"),
Password = Guid.NewGuid().ToString("D"),
})
.WithImage("mongo:4")
.WithImage("mongo:5")
.WithCleanUp(true)
.Build();

2
src/Services/Booking/src/Booking.Api/appsettings.docker.json
View File

@ -9,7 +9,7 @@
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=db;Database=PersistMessageDB;User ID=sa;Password=@Aa123456"
"ConnectionString": "Server=sql;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"RabbitMqOptions": {
"HostName": "rabbitmq",

2
src/Services/Booking/src/Booking.Api/appsettings.json
View File

@ -49,7 +49,7 @@
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"ConnectionString": "Server=localhost;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"AllowedHosts": "*"
}

2
src/Services/Booking/src/Booking.Api/appsettings.test.json
View File

@ -24,6 +24,6 @@
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"ConnectionString": "Server=localhost;Database=PersistMessageDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
}
}

4
src/Services/Flight/src/Flight.Api/appsettings.docker.json
View File

@ -7,7 +7,7 @@
}
},
"DatabaseOptions": {
"DefaultConnection": "Server=db;Database=FlightDB;User ID=sa;Password=@Aa123456"
"DefaultConnection": "Server=sql;Database=FlightDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"Jwt": {
"Authority": "https://localhost:5005",
@ -23,7 +23,7 @@
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=db;Database=PersistMessageDB;User ID=sa;Password=@Aa123456"
"ConnectionString": "Server=sql;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"AllowedHosts": "*"
}

4
src/Services/Flight/src/Flight.Api/appsettings.json
View File

@ -22,7 +22,7 @@
}
},
"DatabaseOptions": {
"DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"DefaultConnection": "Server=localhost;Database=FlightDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"MongoOptions": {
"ConnectionString": "mongodb://localhost:27017",
@ -42,7 +42,7 @@
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"ConnectionString": "Server=localhost;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"HealthOptions": {
"Enabled": false

4
src/Services/Flight/src/Flight.Api/appsettings.test.json
View File

@ -1,6 +1,6 @@
{
"DatabaseOptions": {
"DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"DefaultConnection": "Server=localhost;Database=FlightDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"RabbitMqOptions": {
"HostName": "localhost",
@ -20,6 +20,6 @@
"PersistMessageOptions": {
"Interval": 2,
"Enabled": true,
"ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"ConnectionString": "Server=localhost;Database=PersistMessageDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
}
}

2
src/Services/Flight/src/Flight/Data/DesignTimeDbContextFactory.cs
View File

@ -9,7 +9,7 @@ namespace Flight.Data
{
var builder = new DbContextOptionsBuilder<FlightDbContext>();
builder.UseSqlServer("Data Source=.\\sqlexpress;Initial Catalog=FlightDB;Persist Security Info=False;Integrated Security=SSPI;TrustServerCertificate=True");
builder.UseSqlServer("Server=localhost;Database=FlightDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True");
return new FlightDbContext(builder.Options, null);
}
}

4
src/Services/Identity/src/Identity.Api/appsettings.docker.json
View File

@ -1,12 +1,12 @@
{
"App": "Identity-Service",
"DatabaseOptions": {
"DefaultConnection": "Server=db;Database=IdentityDB;User ID=sa;Password=@Aa123456"
"DefaultConnection": "Server=sql;Database=IdentityDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=db;Database=PersistMessageDB;User ID=sa;Password=@Aa123456"
"ConnectionString": "Server=sql;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"RabbitMqOptions": {
"HostName": "rabbitmq",

4
src/Services/Identity/src/Identity.Api/appsettings.json
View File

@ -3,7 +3,7 @@
"Name": "Identity-Service"
},
"DatabaseOptions": {
"DefaultConnection": "Server=.\\sqlexpress;Database=IdentityDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"DefaultConnection": "Server=localhost;Database=IdentityDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"RabbitMqOptions": {
"HostName": "localhost",
@ -41,7 +41,7 @@
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"ConnectionString": "Server=localhost;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"AllowedHosts": "*"
}

4
src/Services/Identity/src/Identity.Api/appsettings.test.json
View File

@ -1,6 +1,6 @@
{
"DatabaseOptions": {
"DefaultConnection": "Server=.\\sqlexpress;Database=IdentityDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"DefaultConnection": "Server=localhost;Database=IdentityDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"RabbitMqOptions": {
"HostName": "localhost",
@ -20,6 +20,6 @@
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"ConnectionString": "Server=localhost;Database=PersistMessageDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
}
}

2
src/Services/Identity/src/Identity/Data/DesignTimeDbContextFactory.cs
View File

@ -9,7 +9,7 @@ public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<IdentityCo
{
var builder = new DbContextOptionsBuilder<IdentityContext>();
builder.UseSqlServer("Server=.\\sqlexpress;Database=IdentityDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True");
builder.UseSqlServer("Server=localhost;Database=IdentityDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True");
return new IdentityContext(builder.Options, null);
}
}

5
src/Services/Passenger/src/Passenger.Api/appsettings.docker.json
View File

@ -1,12 +1,13 @@
{
"App": "Passenger-Service",
"DatabaseOptions": {
"DefaultConnection": "Server=db;Database=PassengerDB;User ID=sa;Password=@Aa123456"
"DefaultConnection": "Server=sql;Database=PassengerDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=db;Database=PersistMessageDB;User ID=sa;Password=@Aa123456"
"ConnectionString": "Server=sql;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"Jwt": {
"Authority": "https://localhost:5005",

4
src/Services/Passenger/src/Passenger.Api/appsettings.json
View File

@ -3,7 +3,7 @@
"Name": "Passenger-Service"
},
"DatabaseOptions": {
"DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"DefaultConnection": "Server=localhost;Database=PassengerDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"MongoOptions": {
"ConnectionString": "mongodb://localhost:27017",
@ -45,7 +45,7 @@
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"ConnectionString": "Server=localhost;Database=PersistMessageDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"AllowedHosts": "*"
}

4
src/Services/Passenger/src/Passenger.Api/appsettings.test.json
View File

@ -1,6 +1,6 @@
{
"DatabaseOptions": {
"DefaultConnection": "Server=.\\sqlexpress;Database=PassengerDB;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"DefaultConnection": "Server=localhost;Database=PassengerDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
},
"RabbitMqOptions": {
"HostName": "localhost",
@ -20,6 +20,6 @@
"PersistMessageOptions": {
"Interval": 30,
"Enabled": true,
"ConnectionString": "Server=.\\sqlexpress;Database=PersistMessageDB_Test;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
"ConnectionString": "Server=localhost;Database=PersistMessageDB_Test;User ID=sa;Password=@Aa123456;TrustServerCertificate=True"
}
}

3
src/Services/Passenger/src/Passenger/Data/DesignTimeDbContextFactory.cs
View File

@ -9,8 +9,7 @@ public class DesignTimeDbContextFactory: IDesignTimeDbContextFactory<PassengerDb
{
var builder = new DbContextOptionsBuilder<PassengerDbContext>();
builder.UseSqlServer(
"Data Source=.\\sqlexpress;Initial Catalog=PassengerDB;Persist Security Info=False;Integrated Security=SSPI;TrustServerCertificate=True");
builder.UseSqlServer("Server=localhost;Database=PassengerDB;User ID=sa;Password=@Aa123456;TrustServerCertificate=True");
return new PassengerDbContext(builder.Options, null);
}
}