Merge pull request 'Removed pull event from build stage' (#106) from test into main

Reviewed-on: #106

.dockerignore

@@ -12,7 +12,6 @@
 **/*.dbmdl
 **/*.jfm
 **/azds.yaml
-**/bin
 **/charts
 **/docker-compose*
 **/Dockerfile*
@@ -27,4 +26,7 @@ README.md
 !.git/HEAD
 !.git/config
 !.git/packed-refs
-!.git/refs/heads/**
+!.git/refs/heads/**
+# Ensure the build output is NOT ignored
+!**/bin/Release/**/publish/
+!**/publish/

.drone.yml

@@ -1,86 +1,68 @@
 ---
 kind: pipeline
-type: kubernetes
-name: build
-
-clone:
-  disable: false
+type: docker
+name: build-and-package
 
 steps:
-  - name: dotnet restore
-    image: mcr.microsoft.com/dotnet/sdk:8.0
+  - name: build-test-publish
+    image: nexus.khongisa.co.za/sdk:10.0
     commands:
-      - dotnet restore
+      - dotnet restore --source https://nexus.khongisa.co.za/repository/nuget-group/index.json --no-cache
+      - dotnet build --configuration Release --no-restore
+      - dotnet test --configuration Release --no-build
+      - dotnet publish --configuration Release --no-build
 
-  - name: dotnet build
-    image: mcr.microsoft.com/dotnet/sdk:8.0
-    commands:
-      - dotnet build --configuration Release
-      - ls ./SampleApi/bin/Release/net8.0/
-
-  - name: dotnet test
-    image: mcr.microsoft.com/dotnet/sdk:8.0
-    commands:
-      - dotnet test --configuration Release
-
----
-kind: pipeline
-type: kubernetes
-name: package
-
-depends_on:
-  - build
-
-clone:
-  disable: true
-
-steps:
-  - name: dotnet publish
-    image: mcr.microsoft.com/dotnet/sdk:8.0
-    commands:
-      - dotnet publish --configuration Release
-      - ls ./SampleApi/bin/Release/net8.0/publish/
-
-  - name: docker build and push
+  - name: docker-build-and-push
     image: plugins/docker
     settings:
-      repo: registry-server.registry.svc.cluster.local:5000/sampleapi
-      auto_tag: true
-      registry: registry-server.registry.svc.cluster.local:5000
-      insecure: true
-      username:
-        from_secret: registry-username
-      password:
-        from_secret: registry-password
-      dockerfile: Dockerfile
-      context: ./SampleApi/bin/Release/net8.0/publish/
+      registry: nexus.khongisa.co.za
+      repo: nexus.khongisa.co.za/webapitest
+      tags: [ "${DRONE_BUILD_NUMBER}", "latest" ]
+      username: { from_secret: docker_username }
+      password: { from_secret: docker_password }
+
+  - name: vulnerability-scan
+    image: aquasec/trivy:0.50.1
+    environment:
+      TRIVY_USERNAME: { from_secret: docker_username }
+      TRIVY_PASSWORD: { from_secret: docker_password }
+    commands:
+      - trivy image --image-src remote --exit-code 1 --severity CRITICAL nexus.khongisa.co.za/webapitest:${DRONE_BUILD_NUMBER}
+
+trigger:
+  branch:
+    - main
+  event:
+    exclude:
+      - promote
 
 ---
 kind: pipeline
-type: kubernetes
-name: deploy
+type: docker
+name: deploy-to-uat
 
 depends_on:
-  - package
-
-clone:
-  disable: true
+  - build-and-package
 
 steps:
-  - name: deploy via SSH
+  - name: uat-deployment
     image: appleboy/drone-ssh
     settings:
-      host: lead.mngoma.lab
-      username:
-        from_secret: host-username
-      password:
-        from_secret: host-password
-      port: 22
+      host: { from_secret: ssh_host }
+      username: { from_secret: ssh_user }
+      password: { from_secret: ssh_password }
       script:
-        - set -euo pipefail
-        - echo "Applying Kubernetes manifest via SSH..."
-        # Apply the manifest remotely via kubectl on the host
-        - ssh -o StrictHostKeyChecking=no $DRONE_REMOTE_USER@lead.mngoma.lab 'kubectl apply -f -' <<'EOF'
-          $(cat ./manifests/deploy.yml)
-          EOF
-        - echo "Manifest applied successfully."
+        - echo $DOCKER_PASSWORD | docker login nexus.khongisa.co.za -u $DOCKER_USERNAME --password-stdin
+        - docker pull nexus.khongisa.co.za/webapitest:latest
+        - docker stop webapi 2>/dev/null || true
+        - docker rm webapi 2>/dev/null || true
+        - docker run -d --name webapi --restart unless-stopped -e ASPNETCORE_ENVIRONMENT=Development -p 4000:8081 nexus.khongisa.co.za/webapitest:latest
+    environment:
+      DOCKER_USERNAME: { from_secret: docker_username }
+      DOCKER_PASSWORD: { from_secret: docker_password }
+
+trigger:
+  event:
+    - promote
+  target:
+    - staging

Dockerfile

@@ -1,39 +1,11 @@
-# STAGE 1: Build
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-WORKDIR /src
-
-# 1. Copy the .sln and .csproj files first to restore dependencies
-# This makes builds faster by caching the 'restore' layer
-COPY ["SampleApi/SampleApi.csproj", "SampleApi/"]
-RUN dotnet restore "SampleApi/SampleApi.csproj"
-
-# 2. Copy the rest of the code
-COPY . .
-
-# 3. Publish to a FLAT directory
-# We use -o /app/publish and ensure no extra subfolders are created
-RUN dotnet publish "SampleApi/SampleApi.csproj" \
-    -c Release \
-    -o /app/publish \
-    --no-restore \
-    /p:UseAppHost=false
-
-# STAGE 2: Runtime
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM nexus.khongisa.co.za/aspnet:10.0 AS final
 WORKDIR /app
 
-# expose ports
-ENV ASPNETCORE_HTTP_PORTS=8081
+USER app
+
+COPY --chown=app:app ./SampleApi/bin/Release/net10.0/publish/ .
+
 EXPOSE 8081
-
-# Copy the contents directly
-COPY --from=build /app/publish .
-
-# DEBUG: This will print the contents of /app during the build.
-# If SampleApi.dll isn't in this list, the build will stop here.
-RUN ls -la /app
-
-# Set the environment to listen on the port you mapped in Compose
 ENV ASPNETCORE_HTTP_PORTS=8081
 
 ENTRYPOINT ["dotnet", "SampleApi.dll"]

SampleApi/Controllers/DemoController.cs

@@ -0,0 +1,43 @@
+using Microsoft.AspNetCore.Mvc;
+
+// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
+
+namespace SampleApi.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class DemoController : ControllerBase
+    {
+        // GET: api/<DemoController>
+        [HttpGet]
+        public IEnumerable<string> Get()
+        {
+            return new string[] { "value1", "value2" };
+        }
+
+        // GET api/<DemoController>/5
+        [HttpGet("{id}")]
+        public string Get(int id)
+        {
+            return "value";
+        }
+
+        // POST api/<DemoController>
+        [HttpPost]
+        public void Post([FromBody] string value)
+        {
+        }
+
+        // PUT api/<DemoController>/5
+        [HttpPut("{id}")]
+        public void Put(int id, [FromBody] string value)
+        {
+        }
+
+        // DELETE api/<DemoController>/5
+        [HttpDelete("{id}")]
+        public void Delete(int id)
+        {
+        }
+    }
+}

SampleApi/Program.cs

@@ -1,25 +1,22 @@
 var builder = WebApplication.CreateBuilder(args);
 
-// Add services to the container.
-
 builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
+builder.Services.AddHealthChecks();
 
 var app = builder.Build();
 
-// Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
 }
 
+app.MapHealthChecks("/health");
+app.UseRouting();
 app.UseHttpsRedirection();
-
 app.UseAuthorization();
-
 app.MapControllers();
 
 app.Run();

SampleApi/SampleApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>cfe6b4ce-2d40-4273-b3a3-e4df67304fc5</UserSecretsId>
@@ -9,8 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
+    <PackageReference Include="Polly" Version="8.6.6" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
   </ItemGroup>
 
 </Project>

docker-compose.yml

@@ -5,4 +5,6 @@ services:
       context: .
       dockerfile: Dockerfile
     ports:
-      - "8080:8081"
+      - "8081:8081"
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development

manifests/deploy.yml

@@ -1,99 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: experiments
-  labels:
-    name: experiments
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: sampleapi-config
-  namespace: experiments
-data:
-  appname: "SampleApi"
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: sampleapi
-  namespace: experiments
-  labels:
-    app: sampleapi
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: sampleapi
-  template:
-    metadata:
-      labels:
-        app: sampleapi
-    spec:
-      containers:
-        - name: sampleapi
-          image: registry.registry.svc.cluster.local:5000/experiments/sampleapi:latest
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-            - name: https
-              containerPort: 8081
-          resources:
-            requests:
-              memory: "128Mi"
-              cpu: "250m"
-            limits:
-              memory: "256Mi"
-              cpu: "500m"
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: sampleapi
-  namespace: experiments
-spec:
-  type: ClusterIP
-  selector:
-    app: sampleapi
-  ports:
-    - name: http
-      port: 80
-      targetPort: 8080
-    - name: https
-      port: 443
-      targetPort: 8081
----
-apiVersion: traefik.io/v1alpha1
-kind: IngressRoute
-metadata:
-  name: sampleapi-http
-  namespace: experiments
-spec:
-  entryPoints:
-    - web
-  routes:
-    - match: Host(`sampleapi.apps.mngoma.lab`)
-      kind: Rule
-      services:
-        - name: sampleapi
-          port: 80
-          scheme: http
----
-apiVersion: traefik.io/v1alpha1
-kind: IngressRoute
-metadata:
-  name: sampleapi-https
-  namespace: experiments
-spec:
-  entryPoints:
-    - websecure
-  routes:
-    - match: Host(`sampleapi.apps.mngoma.lab`)
-      kind: Rule
-      services:
-        - name: sampleapi
-          port: 443
-          scheme: http
-  tls: {}

manifests/deployment.yaml.bak

@@ -1,93 +0,0 @@
-# namespace
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: experiments
-  labels:
-    name: experiments
----
-# config map
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: sampleapi-configmap
-  namespace: experiments
-data:
-  appname: "SampleApi"
----
-# deployment
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: sampleapi-deployment
-  namespace: experiments
-  labels:
-    app: sampleapi
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: sampleapi
-  template:
-    metadata:
-      labels:
-        app: sampleapi
-    spec:
-      containers:
-      - name: sampleapi
-        image: khwezi/mngomalab:latest
-        imagePullPolicy: IfNotPresent
-        ports:
-        - name: http
-          containerPort: 8080
-          protocol: TCP
-        - name: https
-          containerPort: 8081
-          protocol: TCP
----
-# service
-apiVersion: v1
-kind: Service
-metadata:
-  name: sampleapi-service
-  namespace: experiments
-spec:
-  type: ClusterIP
-  selector:
-    app: sampleapi
-    app.kubernetes.io/instance: sampleapi
-  ports:
-  - port: 8080
-    targetPort: 80
-  - port: 8081
-    targetPort: 443
----
-# ingress
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: sampleapi-ingress
-  namespace: experiments
-  annotations:
-    cert-manager.io/cluster-issuer: sampleapi-secret
-    nginx.ingress.kubernetes.io/rewrite-target: /$1
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-    cert-manager.io/private-key-size: "4096"
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: sampleapi.main.k3s.lab.mngoma.africa
-    http:
-      paths:
-      - pathType: Prefix
-        path: /
-        backend:
-          service:
-            name: sampleapi-service
-            port:
-              number: 80
-  tls:
-  - hosts:
-    - sampleapi.main.k3s.lab.mngoma.africa
-    secretName: sampleapi-secret
-