#110: appsettings updates

SaintAngeLs · Jan 13, 2024 · d0cd674 · d0cd674
1 parent 3224210
commit d0cd674
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 27 deletions.
diff --git a/SwiftParcel.API.Gateway/Dockerfile b/SwiftParcel.API.Gateway/Dockerfile
@@ -10,4 +10,4 @@ WORKDIR /app
 COPY --from=build /app/out .
 ENV ASPNETCORE_URLS http://*:80
 ENV ASPNETCORE_ENVIRONMENT docker
-ENTRYPOINT ["dotnet", "SwiftParcel.Services.Customers.Api.dll"]
+ENTRYPOINT ["dotnet", "SwiftParcel.API.Gateway.dll"]
diff --git a/SwiftParcel.API.Gateway/src/SwiftParcel.API.Gateway/appsettings.json b/SwiftParcel.API.Gateway/src/SwiftParcel.API.Gateway/appsettings.json
@@ -11,15 +11,15 @@
       },
       "seq": {
           "enabled": true,
-          "url": "http://localhost:5341",
+          "url": "http://seq:5341",
           "apiKey": "secret"
       }
   },
   "metrics": {
       "enabled": true,
       "influxEnabled": false,
       "prometheusEnabled": true,
-      "influxUrl": "http://localhost:8086",
+      "influxUrl": "http://influx:8086",
       "database": "swiftparcel",
       "env": "local",
       "interval": 5

diff --git a/...wiftParcel.ExternalAPI.Lecturer.Api/SwiftParcel.ExternalAPI.Lecturer.Api/appsettings.json b/...wiftParcel.ExternalAPI.Lecturer.Api/SwiftParcel.ExternalAPI.Lecturer.Api/appsettings.json
@@ -9,7 +9,7 @@
     "url": "http://consul:8500",
     "service": "lecturer-api-service",
     "address": "lecturer-api-service",
-    "port": "5013",
+    "port": "80",
     "pingEnabled": true,
     "pingEndpoint": "ping",
     "pingInterval": 3,
@@ -21,7 +21,7 @@
     "service": "lecturer-api-service"
   },
   "httpClient": {
-    "type": "",
+    "type": "direct",
     "retries": 3,
     "services": {
       "lecturer-api": "https://mini.currier.api.snet.com.pl",
@@ -129,7 +129,7 @@
     "virtualHost": "/",
     "port": 5672,
     "hostnames": [
-      "localhost"
+      "rabbitmq"
     ],
     "requestedConnectionTimeout": "00:00:30",
     "requestedHeartbeat": "00:01:00",

diff --git a/...ftParcel.Services.Availability.Api/SwiftParcel.Services.Availability.Api/appsettings.json b/...ftParcel.Services.Availability.Api/SwiftParcel.Services.Availability.Api/appsettings.json
@@ -121,7 +121,7 @@
     "virtualHost": "/",
     "port": 5672,
     "hostnames": [
-      "localhost"
+      "rabbitmq"
     ],
     "requestedConnectionTimeout": "00:00:30",
     "requestedHeartbeat": "00:01:00",

diff --git a/.../src/SwiftParcel.Services.Couriers.Api/SwiftParcel.Services.Couriers.Api/appsettings.json b/.../src/SwiftParcel.Services.Couriers.Api/SwiftParcel.Services.Couriers.Api/appsettings.json
@@ -119,7 +119,7 @@
     "virtualHost": "/",
     "port": 5672,
     "hostnames": [
-      "localhost"
+      "rabbitmq"
     ],
     "requestedConnectionTimeout": "00:00:30",
     "requestedHeartbeat": "00:01:00",

diff --git a/...rc/SwiftParcel.Services.Customers.Api/SwiftParcel.Services.Customers.Api/appsettings.json b/...rc/SwiftParcel.Services.Customers.Api/SwiftParcel.Services.Customers.Api/appsettings.json
@@ -118,7 +118,7 @@
     "virtualHost": "/",
     "port": 5672,
     "hostnames": [
-      "localhost"
+      "rabbitmq"
     ],
     "requestedConnectionTimeout": "00:00:30",
     "requestedHeartbeat": "00:01:00",

diff --git a/.../SwiftParcel.Services.Deliveries.Api/SwiftParcel.Services.Deliveries.Api/appsettings.json b/.../SwiftParcel.Services.Deliveries.Api/SwiftParcel.Services.Deliveries.Api/appsettings.json
@@ -119,7 +119,7 @@
     "virtualHost": "/",
     "port": 5672,
     "hostnames": [
-      "localhost"
+      "rabbitmq"
     ],
     "requestedConnectionTimeout": "00:00:30",
     "requestedHeartbeat": "00:01:00",

diff --git a/....Services.Deliveries.Api/SwiftParcel.Services.Deliveries.Api/development.appsettings.json b/....Services.Deliveries.Api/SwiftParcel.Services.Deliveries.Api/development.appsettings.json
@@ -119,7 +119,7 @@
       "virtualHost": "/",
       "port": 5672,
       "hostnames": [
-        "localhost"
+        "rabbitmq"
       ],
       "requestedConnectionTimeout": "00:00:30",
       "requestedHeartbeat": "00:01:00",

diff --git a/...ders/src/SwiftParcel.Services.Orders.Api/SwiftParcel.Services.Orders.Api/appsettings.json b/...ders/src/SwiftParcel.Services.Orders.Api/SwiftParcel.Services.Orders.Api/appsettings.json
@@ -15,7 +15,7 @@
     "service": "orders-service",
     "address": "orders-service",
     "port": "80",
-    "pingEnabled": false,
+    "pingEnabled": true,
     "pingEndpoint": "ping",
     "pingInterval": 3,
     "removeAfterInterval": 3
@@ -127,7 +127,7 @@
     "virtualHost": "/",
     "port": 5672,
     "hostnames": [
-      "localhost"
+      "rabbitmq"
     ],
     "requestedConnectionTimeout": "00:00:30",
     "requestedHeartbeat": "00:01:00",
@@ -157,7 +157,7 @@
     "spanContextHeader": "span_context"
   },
   "redis": {
-    "connectionString": "localhost",
+    "connectionString": "redis",
     "instance": "orders:"
   },
   "swagger": {

diff --git a/SwiftParcel.Services.OrdersCreator/src/SwiftParcel.Services.OrdersCreator/appsettings.json b/SwiftParcel.Services.OrdersCreator/src/SwiftParcel.Services.OrdersCreator/appsettings.json
@@ -99,7 +99,7 @@
     "virtualHost": "/",
     "port": 5672,
     "hostnames": [
-      "localhost"
+      "rabbitmq"
     ],
     "requestedConnectionTimeout": "00:00:30",
     "requestedHeartbeat": "00:01:00",

diff --git a/...ls/src/SwiftParcel.Services.Parcels.Api/SwiftParcel.Services.Parcels.Api/appsettings.json b/...ls/src/SwiftParcel.Services.Parcels.Api/SwiftParcel.Services.Parcels.Api/appsettings.json
@@ -8,23 +8,23 @@
     "enabled": true,
     "url": "http://consul:8500",
     "service": "parcels-service",
-    "address": "localhost",
+    "address": "parcels-service",
     "port": "80",
-    "pingEnabled": false,
+    "pingEnabled": true,
     "pingEndpoint": "ping",
     "pingInterval": 3,
     "removeAfterInterval": 3
   },
   "fabio": {
-    "enabled": false,
+    "enabled": true,
     "url": "http://fabio:9999",
     "services": {
       "pricing": "pricing-service",
       "lecturer-api": "lecturer-api"    
     }
   },
   "httpClient": {
-    "type": "direct",
+    "type": "fabio",
     "retries": 3,
     "services": {
       "pricing": "http://localhost:5008",
@@ -125,7 +125,7 @@
     "virtualHost": "/",
     "port": 5672,
     "hostnames": [
-      "localhost"
+      "rabbitmq"
     ],
     "requestedConnectionTimeout": "00:00:30",
     "requestedHeartbeat": "00:01:00",
@@ -155,7 +155,7 @@
     "spanContextHeader": "span_context"
   },
   "redis": {
-    "connectionString": "localhost",
+    "connectionString": "redis",
     "instance": "parcels:"
   },
   "swagger": {

diff --git a/SwiftParcel.Services.Pricing/src/SwiftParcel.Services.Pricing.Api/appsettings.json b/SwiftParcel.Services.Pricing/src/SwiftParcel.Services.Pricing.Api/appsettings.json
@@ -140,7 +140,7 @@
     "virtualHost": "/",
     "port": 5672,
     "hostnames": [
-      "localhost"
+      "rabbitmq"
     ],
     "requestedConnectionTimeout": "00:00:30",
     "requestedHeartbeat": "00:01:00",

diff --git a/SwiftParcel/d-docker-compose/services.yml b/SwiftParcel/d-docker-compose/services.yml
@@ -30,7 +30,7 @@ services:
       - swiftparcel
 
   parcels-service:
-    image: adrianvsaint/swift-parcel-pricing-service
+    image: adrianvsaint/swift-parcel-parcels-service
     container_name: parcels-service
     restart: unless-stopped
     ports:
@@ -65,9 +65,9 @@ services:
     networks:
       - swiftparcel
 
-  api-lecturer-service:
+  lecturer-api-service:
     image: adrianvsaint/swift-parcel-external-api-lecturer-service
-    container_name: external-api-lecturer-service
+    container_name: lecturer-api-service
     restart: unless-stopped
     ports:
       - 5004:80

diff --git a/SwiftParcel/dockerize_all.sh b/SwiftParcel/dockerize_all.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+directories=(
+    # "SwiftParcel.API.Gateway"
+    "SwiftParcel.ExternalAPI.Lecturer"
+    # "SwiftParcel.Services.Customers"
+    # "SwiftParcel.Services.Deliveries"
+    # "SwiftParcel.Services.Orders"
+    "SwiftParcel.Services.Parcels"
+    # "SwiftParcel.Services.Pricing"
+    # "SwiftParcel.Web"
+    # "SwifttParcel.Services.Identity"
+)
+
+cd ..
+
+for dir in "${directories[@]}"; do
+    echo "Processing $dir..."
+
+    if [ -f "$dir/scripts/dockerize.sh" ]; then
+        echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "
+        (cd "$dir/scripts" && ./dockerize.sh)
+        echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "
+    else
+        echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "
+        echo "dockerize.sh not found in $dir"
+        echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "
+    fi
+done
diff --git a/.../src/SwiftParcel.Services.Identity.Api/SwiftParcel.Services.Identity.Api/appsettings.json b/.../src/SwiftParcel.Services.Identity.Api/SwiftParcel.Services.Identity.Api/appsettings.json
@@ -138,7 +138,7 @@
     "influxEnabled": false,
     "prometheusEnabled": true,
     "influxUrl": "http://influx:8086",
-    "database": "pacco",
+    "database": "swift-parcel",
     "env": "docker",
     "interval": 5
   },
@@ -169,7 +169,7 @@
     "virtualHost": "/",
     "port": 5672,
     "hostnames": [
-      "localhost"
+      "rabbitmq"
     ],
     "requestedConnectionTimeout": "00:00:30",
     "requestedHeartbeat": "00:01:00",

diff --git a/...ervices.Identity.Api/dev.appsettings.json → ...Identity.Api/development.appsettings.json b/...ervices.Identity.Api/dev.appsettings.json → ...Identity.Api/development.appsettings.json