From 4c35f1721f24cf6451db2d51c31ab03f6e1599c5 Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Mon, 30 May 2022 19:35:44 +0100 Subject: [PATCH 01/13] Update pom.xml build failing --- docker-spring-boot/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-spring-boot/pom.xml b/docker-spring-boot/pom.xml index a859604..8103a47 100644 --- a/docker-spring-boot/pom.xml +++ b/docker-spring-boot/pom.xml @@ -19,9 +19,9 @@ UTF-8 - 11 - 11 - 11 + 1.8 + 1.8 + 1.8 @@ -72,4 +72,4 @@ - \ No newline at end of file + From 9f1dbdecd8247c273765ca0bc82dc7f12a5e1ec9 Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Tue, 31 May 2022 18:07:54 +0100 Subject: [PATCH 02/13] Create Jenkinsfile jenkinfile intial commit --- docker-spring-boot/Jenkinsfile | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 docker-spring-boot/Jenkinsfile diff --git a/docker-spring-boot/Jenkinsfile b/docker-spring-boot/Jenkinsfile new file mode 100644 index 0000000..7d7b21a --- /dev/null +++ b/docker-spring-boot/Jenkinsfile @@ -0,0 +1,25 @@ +pipeline { + agent any + + stages { + stage('Hello') { + steps { + sh''' ls -lrt + sudo su + sudo docker version + sudo docker ps + sudo docker ps -a + sudo docker volume ls + sudo rm -rf docker-java + git clone https://github.com/Ikrao/docker-java.git + cd docker-java/docker-spring-boot + mvn clean package + sudo docker build -t spring-boot:1.0 . + sudo docker run --name springboot -d -p 8090:8080 -t spring-boot:1.0 + echo 'containers running' + + ''' + } + } + } +} From a09112b5fc7f7712bf2d4978f24c6c67fa88987d Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Thu, 9 Jun 2022 07:42:01 +0100 Subject: [PATCH 03/13] Update Jenkinsfile --- docker-spring-boot/Jenkinsfile | 43 +++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/docker-spring-boot/Jenkinsfile b/docker-spring-boot/Jenkinsfile index 7d7b21a..8ef1ab1 100644 --- a/docker-spring-boot/Jenkinsfile +++ b/docker-spring-boot/Jenkinsfile @@ -1,25 +1,30 @@ -pipeline { - agent any - - stages { - stage('Hello') { - steps { - sh''' ls -lrt - sudo su - sudo docker version - sudo docker ps - sudo docker ps -a - sudo docker volume ls - sudo rm -rf docker-java - git clone https://github.com/Ikrao/docker-java.git - cd docker-java/docker-spring-boot +node { + + stage('pre-build') { + sh ''' + sudo rm -rf docker-java + ''' + git 'https://github.com/Ikrao/docker-java.git' + + } + stage('Build') { + + sh ''' + pwd + cd docker-spring-boot mvn clean package sudo docker build -t spring-boot:1.0 . + ''' + + + } + stage('run') { + + sh''' + sudo docker stop springboot && sudo docker rm springboot + sudo docker stop springboot && sudo rm springboot sudo docker run --name springboot -d -p 8090:8080 -t spring-boot:1.0 echo 'containers running' - - ''' - } - } + ''' } } From 3a769eb80401d2bffb8dff71d551740331bc0eb4 Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Sat, 25 Jun 2022 21:39:28 +0100 Subject: [PATCH 04/13] Create spring-boot-dp.yaml kubernetes --- docker-spring-boot/spring-boot-dp.yaml | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 docker-spring-boot/spring-boot-dp.yaml diff --git a/docker-spring-boot/spring-boot-dp.yaml b/docker-spring-boot/spring-boot-dp.yaml new file mode 100644 index 0000000..688d63b --- /dev/null +++ b/docker-spring-boot/spring-boot-dp.yaml @@ -0,0 +1,38 @@ +apiVersion: v1 +kind: Service +metadata: + name: springboot-svc + namespace: default +spec: + type: NodePort + ports: + - port: 8080 + selector: + app: spring-app +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: spring-deployment + namespace: default + labels: + app: spring-app +spec: + replicas: 2 + selector: + matchLabels: + app: spring-app + template: + metadata: + labels: + app: spring-app + spec: + containers: + - name: spring-container + image: 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:1.0 + imagePullPolicy: Always + ports: + - name: web + containerPort: 8080 + imagePullSecrets: + - name: regcred From 9d38a6f857a3d89ec09ca81fdce99f3b9457aa60 Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Sat, 25 Jun 2022 21:52:35 +0100 Subject: [PATCH 05/13] Update spring-boot-dp.yaml --- docker-spring-boot/spring-boot-dp.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/docker-spring-boot/spring-boot-dp.yaml b/docker-spring-boot/spring-boot-dp.yaml index 688d63b..bb74793 100644 --- a/docker-spring-boot/spring-boot-dp.yaml +++ b/docker-spring-boot/spring-boot-dp.yaml @@ -1,14 +1,3 @@ -apiVersion: v1 -kind: Service -metadata: - name: springboot-svc - namespace: default -spec: - type: NodePort - ports: - - port: 8080 - selector: - app: spring-app --- apiVersion: apps/v1 kind: Deployment From 00d23c48c8ddec50e1b988ad6f9b1572bd4a9b9e Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Sat, 25 Jun 2022 21:53:22 +0100 Subject: [PATCH 06/13] Create spring-boot-svc.yaml --- docker-spring-boot/spring-boot-svc.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 docker-spring-boot/spring-boot-svc.yaml diff --git a/docker-spring-boot/spring-boot-svc.yaml b/docker-spring-boot/spring-boot-svc.yaml new file mode 100644 index 0000000..5cc9824 --- /dev/null +++ b/docker-spring-boot/spring-boot-svc.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: springboot-svc + namespace: default +spec: + type: NodePort + ports: + - port: 8080 + selector: + app: spring-app From cb2b7c54062609ee58a7e29ce75faa901b441e99 Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Sun, 26 Jun 2022 11:36:13 +0100 Subject: [PATCH 07/13] Update spring-boot-dp.yaml --- docker-spring-boot/spring-boot-dp.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-spring-boot/spring-boot-dp.yaml b/docker-spring-boot/spring-boot-dp.yaml index bb74793..5dfb66c 100644 --- a/docker-spring-boot/spring-boot-dp.yaml +++ b/docker-spring-boot/spring-boot-dp.yaml @@ -18,10 +18,10 @@ spec: spec: containers: - name: spring-container - image: 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:1.0 + image: xxxxx.dkr.ecr.xxxx.amazonaws.com/springboot:1.0 imagePullPolicy: Always ports: - name: web containerPort: 8080 imagePullSecrets: - - name: regcred + - name: my-sec From 0205017b0a96d3984368539f59ead6747028676f Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Thu, 7 Jul 2022 06:51:28 +0100 Subject: [PATCH 08/13] Update Jenkinsfile --- docker-spring-boot/Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-spring-boot/Jenkinsfile b/docker-spring-boot/Jenkinsfile index 8ef1ab1..3418d41 100644 --- a/docker-spring-boot/Jenkinsfile +++ b/docker-spring-boot/Jenkinsfile @@ -21,8 +21,7 @@ node { stage('run') { sh''' - sudo docker stop springboot && sudo docker rm springboot - sudo docker stop springboot && sudo rm springboot + sudo docker stop springboot && sudo docker rm springboot sudo docker run --name springboot -d -p 8090:8080 -t spring-boot:1.0 echo 'containers running' ''' From 12249afd58853accccdd1a874980e8e9fd687a03 Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Tue, 19 Jul 2022 07:00:47 +0100 Subject: [PATCH 09/13] Update Jenkinsfile --- docker-spring-boot/Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-spring-boot/Jenkinsfile b/docker-spring-boot/Jenkinsfile index 3418d41..1933316 100644 --- a/docker-spring-boot/Jenkinsfile +++ b/docker-spring-boot/Jenkinsfile @@ -21,8 +21,12 @@ node { stage('run') { sh''' + aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 492176696130.dkr.ecr.us-east-1.amazonaws.com + docker build -t springboot . + docker tag springboot:latest 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:latest + docker push 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:latest sudo docker stop springboot && sudo docker rm springboot - sudo docker run --name springboot -d -p 8090:8080 -t spring-boot:1.0 + sudo docker run --name springboot -d -p 8090:8080 -t spring-boot:latest echo 'containers running' ''' } From 6442962306cd2af94968ff38a7d4e07355528395 Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Tue, 19 Jul 2022 07:03:40 +0100 Subject: [PATCH 10/13] Update Jenkinsfile --- docker-spring-boot/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-spring-boot/Jenkinsfile b/docker-spring-boot/Jenkinsfile index 1933316..1ee413b 100644 --- a/docker-spring-boot/Jenkinsfile +++ b/docker-spring-boot/Jenkinsfile @@ -21,10 +21,10 @@ node { stage('run') { sh''' - aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 492176696130.dkr.ecr.us-east-1.amazonaws.com - docker build -t springboot . - docker tag springboot:latest 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:latest - docker push 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:latest + sudo aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 492176696130.dkr.ecr.us-east-1.amazonaws.com + sudo docker build -t springboot . + sudo docker tag springboot:latest 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:latest + sudo docker push 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:latest sudo docker stop springboot && sudo docker rm springboot sudo docker run --name springboot -d -p 8090:8080 -t spring-boot:latest echo 'containers running' From df6605a483c52979018a557947ec939dc8835e78 Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Tue, 19 Jul 2022 07:10:32 +0100 Subject: [PATCH 11/13] Update Jenkinsfile --- docker-spring-boot/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-spring-boot/Jenkinsfile b/docker-spring-boot/Jenkinsfile index 1ee413b..5dee1b4 100644 --- a/docker-spring-boot/Jenkinsfile +++ b/docker-spring-boot/Jenkinsfile @@ -13,7 +13,7 @@ node { pwd cd docker-spring-boot mvn clean package - sudo docker build -t spring-boot:1.0 . + sudo docker build -t spring-boot:latest . ''' @@ -22,7 +22,7 @@ node { sh''' sudo aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 492176696130.dkr.ecr.us-east-1.amazonaws.com - sudo docker build -t springboot . + sudo docker tag springboot:latest 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:latest sudo docker push 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:latest sudo docker stop springboot && sudo docker rm springboot From 960ee48ab432a8ab21375b98a451d04167d8a83a Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Tue, 19 Jul 2022 07:12:12 +0100 Subject: [PATCH 12/13] Update Jenkinsfile --- docker-spring-boot/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-spring-boot/Jenkinsfile b/docker-spring-boot/Jenkinsfile index 5dee1b4..7ecb146 100644 --- a/docker-spring-boot/Jenkinsfile +++ b/docker-spring-boot/Jenkinsfile @@ -13,7 +13,7 @@ node { pwd cd docker-spring-boot mvn clean package - sudo docker build -t spring-boot:latest . + sudo docker build -t springboot:latest . ''' @@ -26,7 +26,7 @@ node { sudo docker tag springboot:latest 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:latest sudo docker push 492176696130.dkr.ecr.us-east-1.amazonaws.com/springboot:latest sudo docker stop springboot && sudo docker rm springboot - sudo docker run --name springboot -d -p 8090:8080 -t spring-boot:latest + sudo docker run --name springboot -d -p 8090:8080 -t springboot:latest echo 'containers running' ''' } From 38835e784cfc57c14932fcc8b569891afa0fec10 Mon Sep 17 00:00:00 2001 From: Ikrao <61546692+Ikrao@users.noreply.github.com> Date: Sun, 11 Sep 2022 11:26:51 +0100 Subject: [PATCH 13/13] docker java image change --- docker-spring-boot/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-spring-boot/Dockerfile b/docker-spring-boot/Dockerfile index fe5b723..977cbce 100644 --- a/docker-spring-boot/Dockerfile +++ b/docker-spring-boot/Dockerfile @@ -2,7 +2,7 @@ # FROM openjdk:8-jdk-alpine # For Java 11, try this -FROM adoptopenjdk/openjdk11:alpine-jre +FROM adoptopenjdk:11-jre-hotspot # Refer to Maven build -> finalName ARG JAR_FILE=target/spring-boot-web.jar @@ -18,4 +18,4 @@ ENTRYPOINT ["java","-jar","app.jar"] ## sudo docker run -p 8080:8080 -t docker-spring-boot:1.0 ## sudo docker run -p 80:8080 -t docker-spring-boot:1.0 -## sudo docker run -p 443:8443 -t docker-spring-boot:1.0 \ No newline at end of file +## sudo docker run -p 443:8443 -t docker-spring-boot:1.0