From 2d55a50e3844440e93104d265704342223c7188b Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Sat, 28 Jan 2023 22:27:22 +0530 Subject: [PATCH 01/25] Update pom.xml --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 3512c335..63d83b6c 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,13 @@ devops-integration + + + org.cyclonedx + cyclonedx-maven-plugin + 2.7.3 + + From 92251030160f097ef01ce918ffd08f65ec4c1346 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Sat, 28 Jan 2023 23:07:15 +0530 Subject: [PATCH 02/25] Update pom.xml --- pom.xml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 63d83b6c..822229d6 100644 --- a/pom.xml +++ b/pom.xml @@ -56,15 +56,14 @@ pl.project13.maven git-commit-id-plugin + + org.cyclonedx + cyclonedx-maven-plugin + 2.7.3 + devops-integration - - - org.cyclonedx - cyclonedx-maven-plugin - 2.7.3 - - + From 51d2f4258b40cb1a3ecaffb7214dd912ae4a869e Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Wed, 8 Feb 2023 14:09:30 +0530 Subject: [PATCH 03/25] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 250aaff1..cc782dd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8 +FROM openjdk:jdk-slim-buster EXPOSE 8080 ADD target/devops-integration.jar devops-integration.jar -ENTRYPOINT ["java","-jar","/devops-integration.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","/devops-integration.jar"] From 0c85bc5a9594ab57545753a33093d9d5cc3ff020 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Thu, 9 Feb 2023 12:53:47 +0530 Subject: [PATCH 04/25] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cc782dd3..e01c9f7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:jdk-slim-buster +FROM openjdk:8 EXPOSE 8080 ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From a1ecab11fd0260c63568ac23d8e87cdd14f85024 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Mon, 13 Feb 2023 19:59:09 +0530 Subject: [PATCH 05/25] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e01c9f7d..f2e6412d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8 +FROM openjdk:21-jdk-buster EXPOSE 8080 ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From dd4460b404db3aa1b48c4f7aabd6c50c8aab08bb Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:08:58 +0530 Subject: [PATCH 06/25] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f2e6412d..e6c5df31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:21-jdk-buster +FROM alpine:3.17.2 EXPOSE 8080 ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From 818c43a8d943f69611458b8f16734497fa7a420e Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:20:53 +0530 Subject: [PATCH 07/25] Update Dockerfile --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index e6c5df31..96134d31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,7 @@ FROM alpine:3.17.2 EXPOSE 8080 +RUN apk --no-cache add ca-certificates git +COPY trivy /usr/local/bin/trivy +COPY contrib/*.tpl contrib/ ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From 30c88d8cbb2bd885fd7e7f2859aeabb485642498 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:26:02 +0530 Subject: [PATCH 08/25] Update Dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 96134d31..6a7e0c85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM alpine:3.17.2 EXPOSE 8080 -RUN apk --no-cache add ca-certificates git COPY trivy /usr/local/bin/trivy -COPY contrib/*.tpl contrib/ ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From 37f70c8aead4e11ceb39b1a9335f48e2232302b0 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:33:44 +0530 Subject: [PATCH 09/25] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6a7e0c85..e6c5df31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM alpine:3.17.2 EXPOSE 8080 -COPY trivy /usr/local/bin/trivy ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From ab38cc49ccd53ec15edf8d999ccc543b1db9fc8f Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Mon, 6 Mar 2023 11:10:57 +0530 Subject: [PATCH 10/25] Create Jenkins dependency --- Jenkins dependency | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 Jenkins dependency diff --git a/Jenkins dependency b/Jenkins dependency new file mode 100644 index 00000000..dcfe6882 --- /dev/null +++ b/Jenkins dependency @@ -0,0 +1,46 @@ +pipeline { + agent { + kubernetes { + yaml ''' + apiVersion: v1 + kind: Pod + spec: + containers: + - name: maven + image: maven:alpine + command: + - cat + tty: true + - name: docker + image: docker:latest + command: + - cat + tty: true + volumeMounts: + - mountPath: /var/run/docker.sock + name: docker-sock + volumes: + - name: docker-sock + hostPath: + path: /var/run/docker.sock + ''' + } + } + stages { + stage('maven') { + steps { + container('maven') { + checkout scmGit(branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sanjeeveejayabalan/devops-automation.git']]) + sh 'mvn org.cyclonedx:cyclonedx-maven-plugin:makeBom' + } + } + } + stage('dependencyTrackPublisher') { + steps { + withCredentials([string(credentialsId: 'dependencytrackapikey', variable: 'dependencytrackapikey')]) { + dependencyTrackPublisher artifact: 'target/bom.xml', projectName: 'dptrack3', projectVersion: '1.3', synchronous: true, projectProperties: [tags: ['10', '20'], swidTagId: 'my swid tag', group: 'dptrack3'] + } + } + } + } +} From 0ac0cf950f52116b8690e44e246b0def3ee5b7fe Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Mon, 6 Mar 2023 11:27:02 +0530 Subject: [PATCH 11/25] Update Jenkinsfile --- Jenkinsfile | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ae953c63..8b137891 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,39 +1 @@ -pipeline { - agent any - tools{ - maven 'maven_3_5_0' - } - stages{ - stage('Build Maven'){ - steps{ - checkout([$class: 'GitSCM', branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/Java-Techie-jt/devops-automation']]]) - sh 'mvn clean install' - } - } - stage('Build docker image'){ - steps{ - script{ - sh 'docker build -t javatechie/devops-integration .' - } - } - } - stage('Push image to Hub'){ - steps{ - script{ - withCredentials([string(credentialsId: 'dockerhub-pwd', variable: 'dockerhubpwd')]) { - sh 'docker login -u javatechie -p ${dockerhubpwd}' -} - sh 'docker push javatechie/devops-integration' - } - } - } - stage('Deploy to k8s'){ - steps{ - script{ - kubernetesDeploy (configs: 'deploymentservice.yaml',kubeconfigId: 'k8sconfigpwd') - } - } - } - } -} \ No newline at end of file From 7f87528ee0db7622214f38cd9e6fcc7fe4dbba9d Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Wed, 15 Mar 2023 13:56:19 +0530 Subject: [PATCH 12/25] Create Dockerfilee --- Dockerfilee | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Dockerfilee diff --git a/Dockerfilee b/Dockerfilee new file mode 100644 index 00000000..d088139e --- /dev/null +++ b/Dockerfilee @@ -0,0 +1,23 @@ +FROM docker.io/jenkins/inbound-agent:4.10-3 +USER root +RUN apt-get update && apt-get install -y \ + apt-transport-https \ + ca-certificates \ + curl \ + gnupg2 \ + lsb-release \ + software-properties-common +RUN mkdir -m 0755 -p /etc/apt/keyrings +RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg +RUN echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \ + $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null +RUN apt-get update +RUN apt-get install -y docker-ce-cli docker-ce containerd.io docker-compose-plugin +RUN apt update -y +RUN apt install podman -y +RUN chmod u-s /usr/bin/new[gu]idmap +RUN setcap cap_setuid+eip /usr/bin/newuidmap +RUN setcap cap_setgid+eip /usr/bin/newgidmap + +USER jenkins From a11d33fc6a6277f821f2721914d7c342dfc38337 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Wed, 15 Mar 2023 14:06:39 +0530 Subject: [PATCH 13/25] Rename Dockerfile to Dockerfilee From c3c382b73f04ec0715262da17fc30c83996e234e Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Wed, 15 Mar 2023 14:07:58 +0530 Subject: [PATCH 14/25] Rename Dockerfile to Dockerfile image --- Dockerfile => Dockerfile image | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfile => Dockerfile image (100%) diff --git a/Dockerfile b/Dockerfile image similarity index 100% rename from Dockerfile rename to Dockerfile image From 18f60c3af954eb9c9e77ba8ad4f5968d390c8d44 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Wed, 15 Mar 2023 14:08:44 +0530 Subject: [PATCH 15/25] Rename Dockerfilee to Dockerfile --- Dockerfilee => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfilee => Dockerfile (100%) diff --git a/Dockerfilee b/Dockerfile similarity index 100% rename from Dockerfilee rename to Dockerfile From 72ff858c0f161a035cad93dcbfbdd81a542e0105 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Tue, 28 Mar 2023 18:04:39 +0530 Subject: [PATCH 16/25] Rename Dockerfile to Dockerfile images --- Dockerfile => Dockerfile images | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfile => Dockerfile images (100%) diff --git a/Dockerfile b/Dockerfile images similarity index 100% rename from Dockerfile rename to Dockerfile images From 0aaf4b18f130bed7360744dd8fda42c12b8eb463 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Tue, 28 Mar 2023 18:07:31 +0530 Subject: [PATCH 17/25] Rename Dockerfile image to Dockerfile --- Dockerfile image => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfile image => Dockerfile (100%) diff --git a/Dockerfile image b/Dockerfile similarity index 100% rename from Dockerfile image rename to Dockerfile From 3d28918e36765f36917ff0c9b56d258504a45ec5 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:08:32 +0530 Subject: [PATCH 18/25] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index e6c5df31..141e3e95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ FROM alpine:3.17.2 EXPOSE 8080 +ENV USERNAME=Devsecops +ENV PASSWORD=Test@123 ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From cd81278fb620595558d520b13e044bf7b3005a48 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:20:11 +0530 Subject: [PATCH 19/25] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 141e3e95..75a9aa59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17.2 EXPOSE 8080 -ENV USERNAME=Devsecops -ENV PASSWORD=Test@123 +ENV USERNAME= Devsecops +ENV PASSWORD= Test@123 ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From 9f79cc1c41b54d9485cd6321bade418aa23b3a01 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan Date: Wed, 1 Nov 2023 15:34:20 +0530 Subject: [PATCH 20/25] dockerfilechange --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 75a9aa59..49377c8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17.2 EXPOSE 8080 ENV USERNAME= Devsecops -ENV PASSWORD= Test@123 +ENV PASSWORD= Test@1234 ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From 46674fe18ecd9f585453ed23d7ca9dea11cf62a0 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan Date: Wed, 1 Nov 2023 15:48:11 +0530 Subject: [PATCH 21/25] apikey added --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49377c8a..a07dba68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM alpine:3.17.2 EXPOSE 8080 ENV USERNAME= Devsecops -ENV PASSWORD= Test@1234 +ENV PASSWORD= Test@123i4 +ENV Api Key= zaCELgL. 0imfnc8mVLWwsAawjYr4Rx-Af50DDqtlx ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From bea8103c88661eaf704e9607e2892ed2fb91002d Mon Sep 17 00:00:00 2001 From: Naveen raj <117265644+naveen2131-hue@users.noreply.github.com> Date: Wed, 1 Nov 2023 16:07:29 +0530 Subject: [PATCH 22/25] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a07dba68..e3253daa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.17.2 EXPOSE 8080 -ENV USERNAME= Devsecops -ENV PASSWORD= Test@123i4 -ENV Api Key= zaCELgL. 0imfnc8mVLWwsAawjYr4Rx-Af50DDqtlx +ENV USERNAME=Devsecops +ENV PASSWORD=Test@123i4 +ENV Api Key=zaCELgL. 0imfnc8mVLWwsAawjYr4Rx-Af50DDqtlx ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From 25716ef81f4a7a3723ff6512058d4f8aed5750b8 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Wed, 1 Nov 2023 17:30:37 +0530 Subject: [PATCH 23/25] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e3253daa..117fe653 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,6 @@ FROM alpine:3.17.2 EXPOSE 8080 ENV USERNAME=Devsecops ENV PASSWORD=Test@123i4 -ENV Api Key=zaCELgL. 0imfnc8mVLWwsAawjYr4Rx-Af50DDqtlx +ENV ApiKey=zaCELgL. 0imfnc8mVLWwsAawjYr4Rx-Af50DDqtlx ADD target/devops-integration.jar devops-integration.jar ENTRYPOINT ["java","-jar","/devops-integration.jar"] From f0a9078f1723d46d29086f88510ed6171a389a76 Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:28:38 +0530 Subject: [PATCH 24/25] Create .github --- .github | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github diff --git a/.github b/.github new file mode 100644 index 00000000..95e8edb1 --- /dev/null +++ b/.github @@ -0,0 +1,29 @@ +name: Node.js CI + +on: + push: + branches: + - main # Change this to your branch name + pull_request: + branches: + - main # Change this to your branch name + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Setup Node.js + uses: actions/setup-node@v2 + with: + node-version: '14' # Change to your desired Node.js version + + - name: Install dependencies + run: npm install + + - name: Run tests + run: npm test From 6a5c854c99f792e3dfcb55e8e6496d53bf9e416e Mon Sep 17 00:00:00 2001 From: sanjeeveejayabalan <122220065+sanjeeveejayabalan@users.noreply.github.com> Date: Fri, 5 Jan 2024 15:54:41 +0530 Subject: [PATCH 25/25] Delete .github --- .github | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .github diff --git a/.github b/.github deleted file mode 100644 index 95e8edb1..00000000 --- a/.github +++ /dev/null @@ -1,29 +0,0 @@ -name: Node.js CI - -on: - push: - branches: - - main # Change this to your branch name - pull_request: - branches: - - main # Change this to your branch name - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Setup Node.js - uses: actions/setup-node@v2 - with: - node-version: '14' # Change to your desired Node.js version - - - name: Install dependencies - run: npm install - - - name: Run tests - run: npm test