Merge pull request 'Removed user commands from dockerfile' (#6) from migration into master

Reviewed-on: #6

.drone.yml

@@ -66,7 +66,7 @@ steps:
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
       - kubectl apply -f litecharms-shop-uat.yml
-      - kubectl rollout restart deployment/litecharms-shop-uat -n litecharms-shop-uat
+      - kubectl rollout restart deployment/litecharms-shop -n litecharms-shop-uat
 
 depends_on:
   - package

Shop/Program.cs

@@ -14,10 +14,12 @@ builder.Services.AddBlazoredToast();
 builder.Services.AddEndpointsApiExplorer();
 
 builder.Services.AddMediator();
+builder.Services.AddEmailServiceBus();
 builder.Services.AddSalesServiceBus();
 builder.Services.AddGeneralServiceBus();
-builder.Services.AddShopDatabase(builder.Configuration);
+builder.Services.AddEmailServices(builder.Configuration);
-builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, builder.Configuration);
+builder.Services.AddLeadGeneratorDatabase(builder.Configuration);
+builder.Services.AddQuartzSchedulerClient(LeadGeneratorSchedulerName, LeadGeneratorSchedulerInstanceId, builder.Configuration);
 
 builder.Services.AddPostgresHealtchCheck();
 builder.Services.AddQuartzHealtchCheck();
@@ -26,7 +28,7 @@ builder.Services.AddHealthChecksSupport(builder.Configuration);
 var app = builder.Build();
 
 var schedulerFactory = app.Services.GetRequiredService<ISchedulerFactory>();
-var scheduler = await schedulerFactory.GetScheduler(ShopSchedulerName);
+var scheduler = await schedulerFactory.GetScheduler(LeadGeneratorSchedulerName);
 
 if (!scheduler!.IsStarted)
     await scheduler.Start();

Shop/Shop.csproj

@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Extensions" Version="1.14.0" />
+    <PackageReference Include="LiteCharms.Extensions" Version="1.11.0" />
-    <PackageReference Include="LiteCharms.Features" Version="1.14.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.11.0" />
-    <PackageReference Include="LiteCharms.Models" Version="1.14.0" />
+    <PackageReference Include="LiteCharms.Models" Version="1.11.0" />
     <PackageReference Include="Polly" Version="8.6.6" />
   </ItemGroup>
 

litecharms-shop-uat.yml

@@ -24,7 +24,6 @@ type: Opaque
 data:  
   connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPWxlYWRnZW5lcmF0b3ItZGV2O1VzZXJuYW1lPWxlYWRnZW5lcmF0b3I7UGFzc3dvcmQ9S2VLNDRsczRQWHBuYms7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=  
   quartz-store: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
-  aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -63,7 +62,6 @@ spec:
       containers:
         - name: shop
           image: nexus.khongisa.co.za/litecharms-shop:latest
-          imagePullPolicy: Always
           resources:
             limits:
               memory: "512Mi"
@@ -86,7 +84,12 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: shop-secrets
-                  key: connection-string            
+                  key: connection-string
+            - name: ConnectionStrings__DiscordShop
+              valueFrom:
+                secretKeyRef:
+                  name: shop-secrets
+                  key: discord-webhook
             - name: Monitoring__Address
               valueFrom:
                 configMapKeyRef: