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

Reviewed-on: #6

.drone.yml

@@ -31,37 +31,20 @@ steps:
       registry: nexus.khongisa.co.za
       repo: nexus.khongisa.co.za/litecharms-shop
       tags: [ latest, "1.${DRONE_BUILD_NUMBER}" ]
-      custom_labels:
-        - org.opencontainers.image.source=https://gitea.khongisa.co.za/litecharms/scheduler
-        - org.opencontainers.image.version=1.${DRONE_BUILD_NUMBER}
-        - org.opencontainers.image.revision=${DRONE_COMMIT_SHA}
       username: { from_secret: docker_username }
       password: { from_secret: docker_password }      
 
-  - name: gitea-tag-release
+  - name: gitea-tag
     image: alpine/git
     environment:
-      GITEA_TOKEN: { from_secret: git_token }
       GITEA_USER: { from_secret: git_username }
       GITEA_PASS: { from_secret: git_password }    
     commands:
-      - echo "169.255.58.144 gitea.khongisa.co.za" >> /etc/hosts
+      - git config --global user.email "drone@litecharms.co.za"
-      - apk add --no-cache curl
+      - git config --global user.name "Drone CI"      
-      - git remote set-url origin https://$${GITEA_USER}:$${GITEA_PASS}@gitea.khongisa.co.za/litecharms/scheduler.git
+      - git remote set-url origin https://$${GITEA_USER}:$${GITEA_PASS}@gitea.khongisa.co.za/litecharms/litecharmsshop.git
       - git tag 1.${DRONE_BUILD_NUMBER}
       - git push origin 1.${DRONE_BUILD_NUMBER}
-      - |
-        curl -X POST "https://gitea.khongisa.co.za/api/v1/repos/litecharms/scheduler/releases" \
-             -H "Authorization: token $${GITEA_TOKEN}" \
-             -H "Content-Type: application/json" \
-             -d "{
-               \"tag_name\": \"1.${DRONE_BUILD_NUMBER}\",
-               \"target_commitish\": \"${DRONE_COMMIT_SHA}\",
-               \"name\": \"Release 1.${DRONE_BUILD_NUMBER}\",
-               \"body\": \"### Artifacts\n* **Docker Image:** nexus.khongisa.co.za/litecharms-scheduler:1.${DRONE_BUILD_NUMBER}\n* **NuGet:** [View on Nexus](https://nexus.khongisa.co.za/repository/nuget-group/)\",
-               \"draft\": false,
-               \"prerelease\": false
-             }"
 
 depends_on:
   - build
@@ -83,6 +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 -n litecharms-shop-uat
 
 depends_on:
   - package
@@ -104,6 +88,7 @@ steps:
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
       - kubectl apply -f litecharms-shop.yml
+      - kubectl rollout restart shop/deployment/litecharms-shop -n litecharms-shop
 
 depends_on:
   - uat

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
@@ -44,7 +43,7 @@ metadata:
   name: litecharms-shop
   namespace: litecharms-shop-uat
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: shop
@@ -63,7 +62,6 @@ spec:
       containers:
         - name: shop
           image: nexus.khongisa.co.za/litecharms-shop:latest
-          imagePullPolicy: Always
           resources:
             limits:
               memory: "512Mi"
@@ -87,6 +85,11 @@ spec:
                 secretKeyRef:
                   name: shop-secrets
                   key: connection-string
+            - name: ConnectionStrings__DiscordShop
+              valueFrom:
+                secretKeyRef:
+                  name: shop-secrets
+                  key: discord-webhook
             - name: Monitoring__Address
               valueFrom:
                 configMapKeyRef: