From 9ad4aef26830fe5b7824d47aec61e4dd2cc4e2af Mon Sep 17 00:00:00 2001 From: Ameeeer Date: Fri, 24 Jul 2020 14:18:16 +0300 Subject: [PATCH 1/7] jenkinsfile --- eureka-server/src/docker/Dockerfile | 0 .../src/jenkins/build_docker.jenkins | 42 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 eureka-server/src/docker/Dockerfile create mode 100644 eureka-server/src/jenkins/build_docker.jenkins diff --git a/eureka-server/src/docker/Dockerfile b/eureka-server/src/docker/Dockerfile new file mode 100644 index 0000000..e69de29 diff --git a/eureka-server/src/jenkins/build_docker.jenkins b/eureka-server/src/jenkins/build_docker.jenkins new file mode 100644 index 0000000..f648e5e --- /dev/null +++ b/eureka-server/src/jenkins/build_docker.jenkins @@ -0,0 +1,42 @@ +#!groovy +// Run docker build +properties([disableConcurrentBuilds()]) + +pipeline { + agent { + label 'master' + } + triggers { pollSCM('* * * * *') } + options { + buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')) + timestamps() + } + stages { + stage("docker login") { + steps { + echo " login" + withCredentials([usernamePassword(credentialsId: 'dockerhub_semaev', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { + sh """ + docker login -u $USERNAME -p $PASSWORD + """ + } + } + } + stage("create docker image") { + steps { + echo " start building image" + dir ('docker/toolbox') { + sh 'docker build -t semaev/toolbox:latest . ' + } + } + } + stage("docker push") { + steps { + echo "start pushing image" + sh ''' + docker push semaev/toolbox:latest + ''' + } + } + } +} \ No newline at end of file From da3d26183740cf74aa809f90fe9ec7b205872b39 Mon Sep 17 00:00:00 2001 From: Ameeeer Date: Fri, 24 Jul 2020 14:30:15 +0300 Subject: [PATCH 2/7] docker file --- eureka-server/src/docker/Dockerfile | 4 ++++ eureka-server/src/jenkins/build_docker.jenkins | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/eureka-server/src/docker/Dockerfile b/eureka-server/src/docker/Dockerfile index e69de29..4f1f5af 100644 --- a/eureka-server/src/docker/Dockerfile +++ b/eureka-server/src/docker/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:8-jdk-alpine +ARG JAR_FILE=target/*.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file diff --git a/eureka-server/src/jenkins/build_docker.jenkins b/eureka-server/src/jenkins/build_docker.jenkins index f648e5e..0535c40 100644 --- a/eureka-server/src/jenkins/build_docker.jenkins +++ b/eureka-server/src/jenkins/build_docker.jenkins @@ -15,7 +15,7 @@ pipeline { stage("docker login") { steps { echo " login" - withCredentials([usernamePassword(credentialsId: 'dockerhub_semaev', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { + withCredentials([usernamePassword(credentialsId: 'eureka-server', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { sh """ docker login -u $USERNAME -p $PASSWORD """ From 6f820a2ff7f2cce5d098ca9d47b6070cb0b8abcc Mon Sep 17 00:00:00 2001 From: Ameeeer Date: Fri, 24 Jul 2020 14:33:45 +0300 Subject: [PATCH 3/7] changes on jenkins file --- eureka-server/src/jenkins/build_docker.jenkins | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eureka-server/src/jenkins/build_docker.jenkins b/eureka-server/src/jenkins/build_docker.jenkins index 0535c40..a7d413c 100644 --- a/eureka-server/src/jenkins/build_docker.jenkins +++ b/eureka-server/src/jenkins/build_docker.jenkins @@ -4,7 +4,7 @@ properties([disableConcurrentBuilds()]) pipeline { agent { - label 'master' + label 'dev' } triggers { pollSCM('* * * * *') } options { @@ -15,7 +15,7 @@ pipeline { stage("docker login") { steps { echo " login" - withCredentials([usernamePassword(credentialsId: 'eureka-server', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { + withCredentials([usernamePassword(credentialsId: 'eureka-server', usernameVariable: 'ameeerka', passwordVariable: 'Frnbvtkm3')]) { sh """ docker login -u $USERNAME -p $PASSWORD """ @@ -25,8 +25,8 @@ pipeline { stage("create docker image") { steps { echo " start building image" - dir ('docker/toolbox') { - sh 'docker build -t semaev/toolbox:latest . ' + dir ('eureka-server/src/docker/Dockerfile') { + sh 'docker build -t ameeerka/eureka-server:latest . ' } } } @@ -34,7 +34,7 @@ pipeline { steps { echo "start pushing image" sh ''' - docker push semaev/toolbox:latest + docker push ameeerka/eureka-server:latest ''' } } From fcaf507046009c35688418a313a6e9fe5ed0e561 Mon Sep 17 00:00:00 2001 From: Ameeeer Date: Fri, 24 Jul 2020 14:36:16 +0300 Subject: [PATCH 4/7] changes on jenkins file --- eureka-server/src/jenkins/build_docker.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eureka-server/src/jenkins/build_docker.jenkins b/eureka-server/src/jenkins/build_docker.jenkins index a7d413c..8a43f10 100644 --- a/eureka-server/src/jenkins/build_docker.jenkins +++ b/eureka-server/src/jenkins/build_docker.jenkins @@ -4,7 +4,7 @@ properties([disableConcurrentBuilds()]) pipeline { agent { - label 'dev' + label 'ubuntu' } triggers { pollSCM('* * * * *') } options { From 1886de20e29855b6d58da8995c0b59051dca22ef Mon Sep 17 00:00:00 2001 From: VkRepo <37080049+Ameeeer@users.noreply.github.com> Date: Fri, 24 Jul 2020 14:38:18 +0300 Subject: [PATCH 5/7] Update build_docker.jenkins --- eureka-server/src/jenkins/build_docker.jenkins | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eureka-server/src/jenkins/build_docker.jenkins b/eureka-server/src/jenkins/build_docker.jenkins index 8a43f10..1ce7bb6 100644 --- a/eureka-server/src/jenkins/build_docker.jenkins +++ b/eureka-server/src/jenkins/build_docker.jenkins @@ -4,7 +4,7 @@ properties([disableConcurrentBuilds()]) pipeline { agent { - label 'ubuntu' + label 'master' } triggers { pollSCM('* * * * *') } options { @@ -39,4 +39,4 @@ pipeline { } } } -} \ No newline at end of file +} From 03295fdacc7761034b9ccbdcc27399e4033e0f78 Mon Sep 17 00:00:00 2001 From: VkRepo <37080049+Ameeeer@users.noreply.github.com> Date: Fri, 24 Jul 2020 14:40:12 +0300 Subject: [PATCH 6/7] Update build_docker.jenkins --- eureka-server/src/jenkins/build_docker.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eureka-server/src/jenkins/build_docker.jenkins b/eureka-server/src/jenkins/build_docker.jenkins index 1ce7bb6..0ecafcc 100644 --- a/eureka-server/src/jenkins/build_docker.jenkins +++ b/eureka-server/src/jenkins/build_docker.jenkins @@ -17,7 +17,7 @@ pipeline { echo " login" withCredentials([usernamePassword(credentialsId: 'eureka-server', usernameVariable: 'ameeerka', passwordVariable: 'Frnbvtkm3')]) { sh """ - docker login -u $USERNAME -p $PASSWORD + docker login -u ameeerka -p Frnbvtkm3 """ } } From a1670e3916eb1132e5a7e8fbc7cc5c788548704a Mon Sep 17 00:00:00 2001 From: VkRepo <37080049+Ameeeer@users.noreply.github.com> Date: Fri, 24 Jul 2020 14:52:18 +0300 Subject: [PATCH 7/7] Update Dockerfile --- eureka-server/src/docker/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eureka-server/src/docker/Dockerfile b/eureka-server/src/docker/Dockerfile index 4f1f5af..cae61c5 100644 --- a/eureka-server/src/docker/Dockerfile +++ b/eureka-server/src/docker/Dockerfile @@ -1,4 +1,5 @@ -FROM openjdk:8-jdk-alpine -ARG JAR_FILE=target/*.jar -COPY ${JAR_FILE} app.jar -ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file +FROM alpine +RUN apk add --no-cache curl wget busybox-extras netcat-openbsd python py-pip bash && \ + pip install awscli +RUN apk --purge -v del py-pip +CMD tail -f /dev/null