From d590e3f29ae3ab88f012a9ca4a5ac3ea7be6e497 Mon Sep 17 00:00:00 2001 From: JustFiesta Date: Thu, 2 May 2024 18:25:48 +0200 Subject: [PATCH 1/5] Remove TODO file --- jenkins assesment.TXT | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 jenkins assesment.TXT diff --git a/jenkins assesment.TXT b/jenkins assesment.TXT deleted file mode 100644 index 0eb1c7e3b..000000000 --- a/jenkins assesment.TXT +++ /dev/null @@ -1,40 +0,0 @@ -jenkins assesment: - -3 kontenery na EC2 -> jenkins-docker, jenkins-blueocean, nexus - -!!! Pobranie klucza do EC2 !!! - -EC2 - security groups + t6 type: - ssh -i C:\lokalizacja_klucza\jenkins-assesement-ec2.pem ec2-user@ec2-3-252-205-41.eu-west-1.compute.amazonaws.com - -Po uruchomieniu EC2: - docker start nexus - docker start jenkins-blueocean - docker run \/ - -!!!!!!!! zmieniaj IP w env w JenkinsFile (GitHub), daemon.json (EC2), docker:dind dodaj --insecure-registries !!!!!!!!!!!! - ----------------------------- -W jenkinsie: -add creds - github, nexus - -!!! create github token !!! - ----------------------------- -Serwer Jenkinsa na EC2: - -Nexus: - sudo docker run -d -p 8081-8085:8081-8085 --name nexus -v nexus-data:/nexus-data sonatype/nexus3 - -Jenkins Docker: - sudo docker run --name jenkins-docker --rm --detach --privileged --network jenkins --network-alias docker --env DOCKER_TLS_CERTDIR=/certs --volume jenkins-docker-certs:/certs/client --volume jenkins-data:/var/jenkins_home --publish 2376:2376 docker:dind --insecure-registry 54.195.172.42:8085 --insecure-registry 54.195.172.42:8084 --storage-driver overlay2 - -Jenkins Blueocean: - dockerfile z dokumentacji jenkinsa + run blueocean - https://www.jenkins.io/doc/book/installing/docker/ - - - - - - From 78e0131a17fca18f6428cb3021421477c6e3ef0c Mon Sep 17 00:00:00 2001 From: JustFiesta Date: Thu, 2 May 2024 18:32:56 +0200 Subject: [PATCH 2/5] typo fix --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f76052563..3e3aef9b7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,7 @@ pipeline { } stage('Docker Push (MR)') { steps { - echo 'Pushing Image to docker hub' + echo 'Pushing Image to docker repo' sh 'docker push $NEXUS_DOCKER_REPO_MR/spring-petclinic:${GIT_COMMIT}' } } @@ -102,7 +102,7 @@ pipeline { branch 'main' } steps { - echo 'Pushing Image to docker hub' + echo 'Pushing Image to docker repo' sh 'docker push $NEXUS_DOCKER_REPO_MAIN/spring-petclinic:${GIT_COMMIT}' } } From ca0fe24df14f84d165f997af3683652398d495d7 Mon Sep 17 00:00:00 2001 From: JustFiesta Date: Thu, 2 May 2024 18:40:16 +0200 Subject: [PATCH 3/5] Jenkinsfile fixup --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e3aef9b7..5bee62842 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,8 +74,8 @@ pipeline { NEXUS_CREDS = credentials('nexus-cred') NEXUS_DOCKER_REPO_MAIN = '34.241.46.54:8084' } - - stage('Docker Build (Main)') { + stages { + stage('Docker Build (Main)') { when { branch 'main' } @@ -106,7 +106,7 @@ pipeline { sh 'docker push $NEXUS_DOCKER_REPO_MAIN/spring-petclinic:${GIT_COMMIT}' } } - + } post { always { cleanWs() From ffd9a684bbe3d2564554b0b8b74b7047604d6f38 Mon Sep 17 00:00:00 2001 From: JustFiesta Date: Sat, 18 May 2024 09:57:25 +0200 Subject: [PATCH 4/5] Test changes to Jenkinsfile - merges two pipelines into one --- Jenkinsfile | 72 +++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5bee62842..053751a10 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,7 @@ -// Merge request pipeline + pipeline { agent any + environment { NEXUS_CREDS = credentials('nexus-cred') NEXUS_DOCKER_REPO_MR = '34.241.46.54:8085' @@ -11,6 +12,7 @@ pipeline { } stages { + // Merge request pipeline stage('Checkstyle') { steps{ echo 'Running gradle checkstyle' @@ -57,55 +59,39 @@ pipeline { sh 'docker push $NEXUS_DOCKER_REPO_MR/spring-petclinic:${GIT_COMMIT}' } } - } - post { - always { - cleanWs() - } - } -} - -// Main branch pipeline -pipeline { - agent any - - environment { - NEXUS_CREDS = credentials('nexus-cred') - NEXUS_DOCKER_REPO_MAIN = '34.241.46.54:8084' - } - stages { + // Main branch pipeline stage('Docker Build (Main)') { - when { - branch 'main' + when { + branch 'main' + } + steps { + echo 'Building docker Image' + sh 'docker build -t $NEXUS_DOCKER_REPO_MAIN/spring-petclinic:${GIT_COMMIT} .' + } } - steps { - echo 'Building docker Image' - sh 'docker build -t $NEXUS_DOCKER_REPO_MAIN/spring-petclinic:${GIT_COMMIT} .' - } - } - stage('Docker Login') { - when { - branch 'main' - } - steps { - echo 'Nexus Docker Repository Login' - script{ - withCredentials([usernamePassword(credentialsId: 'nexus-cred', usernameVariable: 'USER', passwordVariable: 'PASS' )]){ - sh 'echo $PASS | docker login -u $USER --password-stdin $NEXUS_DOCKER_REPO_MAIN' + stage('Docker Login') { + when { + branch 'main' + } + steps { + echo 'Nexus Docker Repository Login' + script{ + withCredentials([usernamePassword(credentialsId: 'nexus-cred', usernameVariable: 'USER', passwordVariable: 'PASS' )]){ + sh 'echo $PASS | docker login -u $USER --password-stdin $NEXUS_DOCKER_REPO_MAIN' + } } } } - } - stage('Docker Push (Main)') { - when { - branch 'main' + stage('Docker Push (Main)') { + when { + branch 'main' + } + steps { + echo 'Pushing Image to docker repo' + sh 'docker push $NEXUS_DOCKER_REPO_MAIN/spring-petclinic:${GIT_COMMIT}' + } } - steps { - echo 'Pushing Image to docker repo' - sh 'docker push $NEXUS_DOCKER_REPO_MAIN/spring-petclinic:${GIT_COMMIT}' - } - } } post { always { From eeac93eb83aa045be0886b0d4b33bf6cf4a00bb7 Mon Sep 17 00:00:00 2001 From: JustFiesta Date: Sat, 18 May 2024 10:05:52 +0200 Subject: [PATCH 5/5] EC2 IP update --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 053751a10..2264ffb21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,8 @@ pipeline { environment { NEXUS_CREDS = credentials('nexus-cred') - NEXUS_DOCKER_REPO_MR = '34.241.46.54:8085' + NEXUS_DOCKER_REPO_MR = '34.245.131.115:8085' + NEXUS_DOCKER_REPO_MAIN = '34.245.131.115:8084' } tools {