Merge pull request 'Fixed docker commands on prod step' (#70) from test into main

Reviewed-on: #70

.dockerignore

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

.drone.yml

@@ -1,68 +1,140 @@
 ---
 kind: pipeline
 type: docker
-name: build-and-package
-
-steps:
-  - name: build-test-publish
-    image: nexus.khongisa.co.za/sdk:10.0
-    commands:
-      - 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: docker-build-and-push
-    image: plugins/docker
-    settings:
-      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}
-
+name: build
 trigger:
-  branch:
-    - main
   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 build
+    image: mcr.microsoft.com/dotnet/sdk:10.0
+    commands:
+      - dotnet build --configuration Release
+
+  - name: dotnet test
+    image: mcr.microsoft.com/dotnet/sdk:10.0
+    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
+    commands:
+      - mkdir -p /kaniko/.docker
+      - 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-to-uat
-
+name: deploy
 depends_on:
-  - build-and-package
+  - package
+trigger:
+  event:
+    exclude:
+      - promote
+
+clone:
+  disable: true
 
 steps:
-  - name: uat-deployment
+  - name: uat
     image: appleboy/drone-ssh
     settings:
-      host: { from_secret: ssh_host }
-      username: { from_secret: ssh_user }
-      password: { from_secret: ssh_password }
+      host: 
+        from_secret: ssh_host
+      username: 
+        from_secret: ssh_user
+      password: 
+        from_secret: ssh_password
       script:
-        - 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 }
+        - docker pull khwezi/webapitest:latest
+        - docker run -d --name webapi --restart unless-stopped -e ASPNETCORE_ENVIRONMENT=Development -p 4000:8081 khwezi/webapitest:latest
 
-trigger:
+---
+kind: pipeline
+type: docker
+name: golive
+depends_on:
+  - deploy
+
+clone:
+  disable: true
+
+steps:
+  - name: prod
+    image: appleboy/drone-ssh
+    environment:
+      PLUGIN_USER:
+        from_secret: ssh_prod_user
+      PLUGIN_PASSWORD:
+        from_secret: ssh_prod_password
+      PLUGIN_HOST:
+        from_secret: ssh_prod_host
+    settings:
+      script:
+        - docker pull khwezi/webapitest:latest
+        - docker run -d --name webapi --restart unless-stopped -e ASPNETCORE_ENVIRONMENT=Production -p 4001:8081 khwezi/webapitest:latest
+    when:
       event:
         - promote
       target:
-    - staging
+        - prod

Dockerfile

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

SampleApi/SampleApi.csproj

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