Merge pull request 'MOved donet package step to build stage' (#49) from test into main

Reviewed-on: #49

.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,127 @@
 ---
 kind: pipeline
 type: docker
-name: build-and-package
+name: build
-
-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}
-
 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:8.0
+    commands:
+      - dotnet build --configuration Release
+
+  - name: dotnet test
+    image: mcr.microsoft.com/dotnet/sdk:8.0
+    commands:
+      - dotnet test --configuration Release
+  
+  - name: dotnet publish
+    image: mcr.microsoft.com/dotnet/sdk:8.0
+    commands:
+      - dotnet publish --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: 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}
+
 ---
 kind: pipeline
 type: docker
-name: deploy-to-uat
+name: deploy
-
 depends_on:
-  - build-and-package
+  - package
-
-steps:
-  - name: uat-deployment
-    image: appleboy/drone-ssh
-    settings:
-      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 }
-
 trigger:
   event:
-    - promote
+    exclude:
-  target:
+      - promote
-    - staging
+
+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 -p 4000:8081 khwezi/webapitest:latest
+
+  - name: prod
+    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 webapi || true
+        - docker rm webapi || true
+        - docker run -d --name webapi -p 4001:8081 khwezi/webapitest:latest
+    when:
+      event:
+        - promote
+      target:
+        - prod

Dockerfile

@@ -1,11 +1,10 @@
-FROM nexus.khongisa.co.za/aspnet:10.0 AS final
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
 
-USER app
+COPY ./SampleApi/bin/Release/net8.0/publish/ .
 
-COPY --chown=app:app ./SampleApi/bin/Release/net10.0/publish/ .
-
-EXPOSE 8081
 ENV ASPNETCORE_HTTP_PORTS=8081
+EXPOSE 8081
 
+WORKDIR /app
 ENTRYPOINT ["dotnet", "SampleApi.dll"]

SampleApi/Controllers/DemoController.cs

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