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

Reviewed-on: #106

.dockerignore

@@ -27,4 +27,6 @@ README.md
 !.git/config
 !.git/packed-refs
 !.git/refs/heads/**
-
+# Ensure the build output is NOT ignored
+!**/bin/Release/**/publish/
+!**/publish/

.drone.yml

@@ -1,143 +1,68 @@
 ---
 kind: pipeline
 type: docker
-name: build
+name: build-and-package
-trigger:
-  event:
-    exclude:
-      - promote
-
-clone:
-  disable: true
 
 steps:
-  - name: checkout
+  - name: build-test-publish
-    image: alpine/git
+    image: nexus.khongisa.co.za/sdk:10.0
     commands:
-      - git clone https://gitea.khongisa.co.za/MngomaLab/webapitest.git .
+      - dotnet restore --source https://nexus.khongisa.co.za/repository/nuget-group/index.json --no-cache
-      - git checkout ${DRONE_COMMIT}
+      - dotnet build --configuration Release --no-restore
+      - dotnet test --configuration Release --no-build
+      - dotnet publish --configuration Release --no-build
 
-  - name: dotnet build
+  - name: docker-build-and-push
-    image: mcr.microsoft.com/dotnet/sdk:10.0
+    image: plugins/docker
-    commands:
+    settings:
-      - dotnet build --configuration Release
+      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: dotnet test
+  - name: vulnerability-scan
-    image: mcr.microsoft.com/dotnet/sdk:10.0
+    image: aquasec/trivy:0.50.1
-    commands:
-      - dotnet test --configuration Release
----
-x-docker-auth: &docker-auth
-  DOCKER_AUTH_CONFIG: |
-    {
-      "auths": {
-        "https://index.docker.io/v1/": {
-          "auth": "a2h3ZXppOlBHM0FRM0VPMFg="
-        }
-      }
-    }
-
-kind: pipeline
-type: docker
-name: package
-depends_on:
-  - build
-trigger:
-  event:
-    exclude:
-      - promote
-
-clone:
-  disable: true
-
-steps:
-  - name: checkout
-    image: alpine/git
-    commands:
-      - git clone https://gitea.khongisa.co.za/MngomaLab/webapitest.git .
-      - git checkout ${DRONE_COMMIT}
-  
-  - name: dotnet publish
-    image: mcr.microsoft.com/dotnet/sdk:10.0
-    commands:
-      - dotnet publish --configuration Release
-
-
-  - name: build and push
-    image: gcr.io/kaniko-project/executor:debug
     environment:
-      <<: *docker-auth
+      TRIVY_USERNAME: { from_secret: docker_username }
+      TRIVY_PASSWORD: { from_secret: docker_password }
     commands:
-      - mkdir -p /kaniko/.docker
+      - trivy image --image-src remote --exit-code 1 --severity CRITICAL nexus.khongisa.co.za/webapitest:${DRONE_BUILD_NUMBER}
-      - echo "$DOCKER_AUTH_CONFIG" > /kaniko/.docker/config.json
-      - /kaniko/executor 
-          --verbosity=debug
-          --context=. 
-          --dockerfile=Dockerfile 
-          --destination=index.docker.io/khwezi/webapitest:latest 
-          --destination=index.docker.io/khwezi/webapitest:${DRONE_BUILD_NUMBER}
 
-  - name: volnerability scan
-    image: aquasec/trivy
-    commands:
-      - trivy image --exit-code 1 --timeout 15m --severity CRITICAL khwezi/webapitest:${DRONE_BUILD_NUMBER}
----
-kind: pipeline
-type: docker
-name: deploy
-depends_on:
-  - package
 trigger:
+  branch:
+    - main
   event:
     exclude:
       - promote
 
-clone:
-  disable: true
-
-steps:
-  - name: uat
-    image: appleboy/drone-ssh
-    settings:
-      host: 
-        from_secret: ssh_host
-      username: 
-        from_secret: ssh_user
-      password: 
-        from_secret: ssh_password
-      script:
-        - docker pull khwezi/webapitest:latest
-        - docker stop webapitest || true
-        - docker rm webapitest || true
-        - docker run -d --name webapitest -e ASPNETCORE_ENVIRONMENT=Development -p 4000:8081 khwezi/webapitest:latest
-
 ---
 kind: pipeline
 type: docker
-name: golive
+name: deploy-to-uat
-depends_on:
-  - deploy
 
-clone:
+depends_on:
-  disable: true
+  - build-and-package
 
 steps:
-  - name: prod
+  - name: uat-deployment
     image: appleboy/drone-ssh
     settings:
-      host: 
+      host: { from_secret: ssh_host }
-        from_secret: ssh_prod_host
+      username: { from_secret: ssh_user }
-      username: 
+      password: { from_secret: ssh_password }
-        from_secret: ssh_prod_user
-      password: 
-        from_secret: ssh_prod_password
       script:
-        - docker pull khwezi/webapitest:latest
+        - echo $DOCKER_PASSWORD | docker login nexus.khongisa.co.za -u $DOCKER_USERNAME --password-stdin
-        - docker stop webapi || true
+        - docker pull nexus.khongisa.co.za/webapitest:latest
-        - docker rm webapi || true
+        - docker stop webapi 2>/dev/null || true
-        - docker run -d --name webapi -e ASPNETCORE_ENVIRONMENT=Production -p 4001:8081 khwezi/webapitest:latest
+        - docker rm webapi 2>/dev/null || true
-    when:
+        - docker run -d --name webapi --restart unless-stopped -e ASPNETCORE_ENVIRONMENT=Development -p 4000:8081 nexus.khongisa.co.za/webapitest:latest
-      event:
+    environment:
-        - promote
+      DOCKER_USERNAME: { from_secret: docker_username }
-      target:
+      DOCKER_PASSWORD: { from_secret: docker_password }
-        - prod
+
+trigger:
+  event:
+    - promote
+  target:
+    - staging

Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS final
+FROM nexus.khongisa.co.za/aspnet:10.0 AS final
 WORKDIR /app
 
 USER app

SampleApi/SampleApi.csproj

@@ -9,8 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Polly" Version="8.6.6" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
   </ItemGroup>
 
 </Project>