Have a working docker-compose with consul service name in config

madslundt · madslundt · commit e45eb5c73254 · 2020-08-14T15:07:40.000+02:00
diff --git a/ApiGateway/Configuration/ocelot.global.json b/ApiGateway/Configuration/ocelot.global.json
@@ -5,7 +5,7 @@
     "DownstreamScheme": "http",
     "ServiceDiscoveryProvider": {
       "Type": "PollConsul",
-      "Host": "consul",
+      "Host": "http://consul",
       "Port": 8500,
       "ConfigurationKey": "ApiGateway_1",
       "PollingInterval": 100
diff --git a/ApiGateway/Configuration/ocelot.movies.json b/ApiGateway/Configuration/ocelot.movies.json
@@ -1,5 +1,16 @@
 {
   "Routes": [
+    {
+      "DownstreamPathTemplate": "/api/movies/{movieId}/reviews",
+      "DownstreamScheme": "http",
+      "UpstreamPathTemplate": "/api/movies/{movieId}/reviews",
+      "ServiceName": "ReviewsService",
+      "SwaggerKey": "ReviewsService",
+      "FileCacheOptions": { "TtlSeconds": 15 },
+      "LoadBalancerOptions": {
+        "Type": "LeastConnection"
+      }
+    },
     {
       "DownstreamPathTemplate": "/api/movies/{movieId}/reviews/{everything}",
       "DownstreamScheme": "http",
@@ -12,6 +23,17 @@
       }
     },
 
+    {
+      "DownstreamPathTemplate": "/api/movies",
+      "DownstreamScheme": "http",
+      "UpstreamPathTemplate": "/api/movies",
+      "ServiceName": "MoviesService",
+      "SwaggerKey": "MoviesService",
+      "FileCacheOptions": { "TtlSeconds": 15 },
+      "LoadBalancerOptions": {
+        "Type": "LeastConnection"
+      }
+    },
     {
       "DownstreamPathTemplate": "/api/movies/{everything}",
       "DownstreamScheme": "http",
diff --git a/ApiGateway/Configuration/ocelot.reviews.json b/ApiGateway/Configuration/ocelot.reviews.json
@@ -1,5 +1,16 @@
 {
   "Routes": [
+    {
+      "DownstreamPathTemplate": "/api/reviews",
+      "DownstreamScheme": "http",
+      "UpstreamPathTemplate": "/api/reviews",
+      "ServiceName": "ReviewsService",
+      "SwaggerKey": "ReviewsService",
+      "FileCacheOptions": { "TtlSeconds": 15 },
+      "LoadBalancerOptions": {
+        "Type": "LeastConnection"
+      }
+    },
     {
       "DownstreamPathTemplate": "/api/reviews/{everything}",
       "DownstreamScheme": "http",
diff --git a/ApiGateway/Configuration/ocelot.users.json b/ApiGateway/Configuration/ocelot.users.json
@@ -1,5 +1,16 @@
 {
   "Routes": [
+    {
+      "DownstreamPathTemplate": "/api/users/{userId}/movies",
+      "DownstreamScheme": "http",
+      "UpstreamPathTemplate": "/api/users/{userId}/movies",
+      "ServiceName": "MoviesService",
+      "SwaggerKey": "MoviesService",
+      "FileCacheOptions": { "TtlSeconds": 15 },
+      "LoadBalancerOptions": {
+        "Type": "LeastConnection"
+      }
+    },
     {
       "DownstreamPathTemplate": "/api/users/{userId}/movies/{everything}",
       "DownstreamScheme": "http",
@@ -12,6 +23,17 @@
       }
     },
 
+    {
+      "DownstreamPathTemplate": "/api/users/{userId}/reviews",
+      "DownstreamScheme": "http",
+      "UpstreamPathTemplate": "/api/users/{userId}/reviews",
+      "ServiceName": "ReviewsService",
+      "SwaggerKey": "ReviewsService",
+      "FileCacheOptions": { "TtlSeconds": 15 },
+      "LoadBalancerOptions": {
+        "Type": "LeastConnection"
+      }
+    },
     {
       "DownstreamPathTemplate": "/api/users/{userId}/reviews/{everything}",
       "DownstreamScheme": "http",
@@ -24,6 +46,18 @@
       }
     },
 
+    {
+      "DownstreamPathTemplate": "/api/users",
+      "DownstreamScheme": "http",
+      "UpstreamPathTemplate": "/api/users",
+      "ServiceName": "UsersService",
+      "SwaggerKey": "UsersService",
+      "UpstreamHttpMethod": [ "Get", "Post" ],
+      "FileCacheOptions": { "TtlSeconds": 15 },
+      "LoadBalancerOptions": {
+        "Type": "LeastConnection"
+      }
+    },
     {
       "DownstreamPathTemplate": "/api/users/{everything}",
       "DownstreamScheme": "http",
diff --git a/Compose/docker-compose.yml b/Compose/docker-compose.yml
@@ -1,14 +1,36 @@
 version: '3.5'
 
+networks:
+  # Network for API gateway
+  network-gateway:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.28.2.0/24
+  # Network for microservices
+  network-microservice:
+    #internal: true
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.28.4.0/24
+
 services:
   api:
     build: ../ApiGateway
     container_name: api
-    restart: on-failure
+    restart: unless-stopped
     ports:
       - "8080:80"
     networks:
-      - docker-network
+      - network-gateway
+      - network-microservice
+    links:
+      - users_service
+      - movies_service
+      - reviews_service
     depends_on:
       - consul
 
@@ -18,35 +40,52 @@ services:
       context: ../
       dockerfile: Src/UsersService/Dockerfile
     container_name: users_service
-    restart: on-failure
+    restart: unless-stopped
     networks:
-      - docker-network
+      - network-microservice
+    links:
+      - rabbitmq
+      - db
+      - mongo
+      - consul
     depends_on:
       - rabbitmq
       - db
       - mongo
       - consul
+
   movies_service:
     build:
       context: ../
       dockerfile: Src/MoviesService/Dockerfile
     container_name: movies_service
-    restart: on-failure
+    restart: unless-stopped
     networks:
-      - docker-network
+      - network-microservice
+    links:
+      - rabbitmq
+      - db
+      - mongo
+      - consul
     depends_on:
       - rabbitmq
       - db
       - mongo
       - consul
+
   reviews_service:
     build:
       context: ../
       dockerfile: Src/ReviewsService/Dockerfile
     container_name: reviews_service
-    restart: on-failure
+    restart: unless-stopped
     networks:
-      - docker-network
+      - network-microservice
+    links:
+      - rabbitmq
+      - db
+      - mongo
+      - consul
     depends_on:
       - rabbitmq
       - db
@@ -56,25 +95,28 @@ services:
   db:
    image: mcr.microsoft.com/mssql/server:2019-latest
    container_name: db
+   restart: on-failure
    environment:
     - "ACCEPT_EULA=Y"
     - "SA_PASSWORD=pass123!"
    ports:
     - "1433:1433"
    networks:
-    - docker-network
+    - network-microservice
 
   mongo:
     image: mongo
     container_name: mongo
+    restart: on-failure
     ports:
       - "27017:27017"
     networks:
-      - docker-network
+      - network-microservice
 
   elasticsearch:
    image: docker.elastic.co/elasticsearch/elasticsearch:7.8.1
    container_name: elasticsearch
+   restart: on-failure
    ports:
     - "9200:9200"
    environment:
@@ -83,57 +125,61 @@ services:
    volumes:
     - elasticsearch-data:/usr/share/elasticsearch/data
    networks:
-    - docker-network
+    - network-microservice
 
   kibana:
    image: docker.elastic.co/kibana/kibana:7.8.1
    container_name: kibana
+   restart: on-failure
    ports:
     - "5601:5601"
    depends_on:
     - elasticsearch
    networks:
-    - docker-network
+    - network-microservice
 
   apm:
    image: docker.elastic.co/apm/apm-server:7.8.1
    container_name: apm
+   restart: on-failure
    ports:
     - "8200:8200"
    depends_on:
     - kibana
    networks:
-    - docker-network
+    - network-microservice
 
   rabbitmq:
     image: rabbitmq:3-management
     container_name: rabbitmq
+    restart: on-failure
+    environment:
+     - RABBITMQ_DEFAULT_USER=user
+     - RABBITMQ_DEFAULT_PASS=password
     ports:
      - "5672:5672"
      - "15672:15672"
     networks:
-     - docker-network
+     - network-microservice
 
   # kafka:
   #   image: wurstmeister/kafka
   #   container_name: kafka
+  #   restart: on-failure
   #   ports:
   #    - "9092:9092"
   #    - "9093:9093"
   #   networks:
-  #    - docker-network
+  #    - network-microservice
 
   consul:
     image: consul
     container_name: consul
+    restart: on-failure
     ports:
      - "8500:8500"
     networks:
-     - docker-network
-
-networks:
-  docker-network:
-    driver: bridge
+     - network-microservice
 
 volumes:
   elasticsearch-data:
diff --git a/Infrastructure/Consul/ConsulExtensions.cs b/Infrastructure/Consul/ConsulExtensions.cs
@@ -22,7 +22,7 @@ public static IServiceCollection AddConsul(this IServiceCollection services, ICo
 
             services.AddSingleton<IConsulClient, ConsulClient>(p => new ConsulClient(consulConfig =>
             {
-                var address = options.Address;
+                var address = options.ConsulAddress;
                 consulConfig.Address = new Uri(address);
             }));
 
@@ -42,16 +42,24 @@ public static IApplicationBuilder UseConsul(this IApplicationBuilder app, IHostA
             var logger = loggingFactory.CreateLogger<IApplicationBuilder>();
 
             // Get server IP address
-            var features = app.Properties["server.Features"] as FeatureCollection;
-            var addresses = features.Get<IServerAddressesFeature>();
-            var address = addresses.Addresses.First();
+            var address = consulConfig.Value.ServiceAddress;
+
+            if (string.IsNullOrWhiteSpace(address))
+            {
+                var features = app.Properties["server.Features"] as FeatureCollection;
+                var addresses = features.Get<IServerAddressesFeature>();
+                address = addresses.Addresses.First();
+
+                Console.WriteLine($"Could not find service address in config. Using '{address}'");
+            }
 
             // Register service with consul
             var uri = new Uri(address);
+            var serviceName = consulConfig.Value.Name ?? AppDomain.CurrentDomain.FriendlyName.Trim().Trim('_');
             var registration = new AgentServiceRegistration()
             {
-                ID = consulConfig.Value.Id ?? Guid.NewGuid().ToString(),
-                Name = consulConfig.Value.Name ?? AppDomain.CurrentDomain.FriendlyName.Trim().Trim('_'),
+                ID = $"{serviceName.ToLowerInvariant()}-{consulConfig.Value.Id ?? Guid.NewGuid().ToString()}",
+                Name = serviceName,
                 Address = uri.Host,
                 Port = uri.Port,
                 Tags = consulConfig.Value.Tags
diff --git a/Infrastructure/Consul/ConsulOptions.cs b/Infrastructure/Consul/ConsulOptions.cs
@@ -5,6 +5,7 @@ public class ConsulOptions
         public string Id { get; set; }
         public string Name { get; set; }
         public string[] Tags { get; set; }
-        public string Address { get; set; }
+        public string ConsulAddress { get; set; }
+        public string ServiceAddress { get; set; }
     }
 }
diff --git a/Src/MoviesService/appsettings.json b/Src/MoviesService/appsettings.json
diff --git a/Src/ReviewsService/appsettings.json b/Src/ReviewsService/appsettings.json
diff --git a/Src/UsersService/appsettings.json b/Src/UsersService/appsettings.json

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ public class ConsulOptions`
`5`	`5`	`public string Id { get; set; }`
`6`	`6`	`public string Name { get; set; }`
`7`	`7`	`public string[] Tags { get; set; }`
`8`		`- public string Address { get; set; }`
	`8`	`+ public string ConsulAddress { get; set; }`
	`9`	`+ public string ServiceAddress { get; set; }`
`9`	`10`	`}`
`10`	`11`	`}`