From c38f40db6408793d4d5c9ef4210079c62129869a Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Sat, 21 Oct 2023 14:04:03 +0300 Subject: [PATCH 01/16] Create docker_jenkins --- jenkinsfiles/docker_jenkins | 1 + 1 file changed, 1 insertion(+) create mode 100644 jenkinsfiles/docker_jenkins diff --git a/jenkinsfiles/docker_jenkins b/jenkinsfiles/docker_jenkins new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/jenkinsfiles/docker_jenkins @@ -0,0 +1 @@ + From f55c371c34d38a637e2738be2a16f911d640869e Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Sat, 21 Oct 2023 14:04:39 +0300 Subject: [PATCH 02/16] Rename docker_jenkins to docker_jenkins.jenkins --- jenkinsfiles/{docker_jenkins => docker_jenkins.jenkins} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jenkinsfiles/{docker_jenkins => docker_jenkins.jenkins} (100%) diff --git a/jenkinsfiles/docker_jenkins b/jenkinsfiles/docker_jenkins.jenkins similarity index 100% rename from jenkinsfiles/docker_jenkins rename to jenkinsfiles/docker_jenkins.jenkins From 0a2282e3cbb631ac6c611424d940f5f33b63bc25 Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Sat, 21 Oct 2023 14:08:06 +0300 Subject: [PATCH 03/16] Update docker_jenkins.jenkins --- jenkinsfiles/docker_jenkins.jenkins | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/jenkinsfiles/docker_jenkins.jenkins b/jenkinsfiles/docker_jenkins.jenkins index 8b13789..1e170b6 100644 --- a/jenkinsfiles/docker_jenkins.jenkins +++ b/jenkinsfiles/docker_jenkins.jenkins @@ -1 +1,23 @@ +#!groovy +// Run docker build +properties([disableConcurrentBuilds()]) +pipeline { + agent { + label 'master' + } + options { + buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')) + timestamps() + } + stages { + stage("create docker image") { + steps { + echo " ============== start building image ==================" + dir ('docker/toolbox'){ + sh 'docker build . ' + } + } + } + } +} From 095945b028fa46bee487a883394761283a546e47 Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Sat, 21 Oct 2023 14:16:27 +0300 Subject: [PATCH 04/16] Update Dockerfile --- docker/toolbox/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/toolbox/Dockerfile b/docker/toolbox/Dockerfile index cae61c5..aeeede5 100644 --- a/docker/toolbox/Dockerfile +++ b/docker/toolbox/Dockerfile @@ -1,5 +1,5 @@ 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 + pip install awscli && \ + apk --purge -v del py-pip CMD tail -f /dev/null From f1457740bdbb36879c9eeaa9dd78209db31adf42 Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Sat, 21 Oct 2023 14:20:07 +0300 Subject: [PATCH 05/16] Update Dockerfile --- docker/toolbox/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/toolbox/Dockerfile b/docker/toolbox/Dockerfile index aeeede5..d1e67b1 100644 --- a/docker/toolbox/Dockerfile +++ b/docker/toolbox/Dockerfile @@ -1,5 +1,6 @@ FROM alpine -RUN apk add --no-cache curl wget busybox-extras netcat-openbsd python py-pip bash && \ +RUN apk add --no-cache curl wget busybox-extras netcat-openbsd python3 py3-pip bash && \ pip install awscli && \ - apk --purge -v del py-pip + apk --purge -v del py3-pip CMD tail -f /dev/null + From 77b50340526c99f609bc0552f8fc8b2acc532b09 Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:01:55 +0300 Subject: [PATCH 06/16] Create Dockerfile --- docker/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docker/Dockerfile diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..d7e4a49 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,5 @@ +FROM alpine +RUN apk add --no-cache curl wget busybox-extras netcat-openbsd python3 py3-pip bash && \ + pip install awscli && \ + apk --purge -v del py3-pip +CMD tail -f /dev/null From b40613c0d3f0bbef20ec68dd3fa1267f838df2cb Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:13:53 +0300 Subject: [PATCH 07/16] Update docker_jenkins.jenkins poll SCM added --- jenkinsfiles/docker_jenkins.jenkins | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkinsfiles/docker_jenkins.jenkins b/jenkinsfiles/docker_jenkins.jenkins index 1e170b6..b3f74b8 100644 --- a/jenkinsfiles/docker_jenkins.jenkins +++ b/jenkinsfiles/docker_jenkins.jenkins @@ -6,6 +6,7 @@ pipeline { agent { label 'master' } + triggers{ pollSCM('* * * * *') } options { buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')) timestamps() From 84a675cbde5ff1ee49bfe81020fcd1df7f1ad38e Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:20:40 +0300 Subject: [PATCH 08/16] Combined two RUNs --- docker/toolbox/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/toolbox/Dockerfile b/docker/toolbox/Dockerfile index d1e67b1..0f92007 100644 --- a/docker/toolbox/Dockerfile +++ b/docker/toolbox/Dockerfile @@ -1,6 +1,6 @@ FROM alpine RUN apk add --no-cache curl wget busybox-extras netcat-openbsd python3 py3-pip bash && \ - pip install awscli && \ - apk --purge -v del py3-pip + pip install awscli +RUN apk --purge -v del py3-pip CMD tail -f /dev/null From b2505303a8a4e8b9cba60c239b14d753f1a5672d Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 17:42:50 +0300 Subject: [PATCH 09/16] Added docker tags --- jenkinsfiles/docker_jenkins.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkinsfiles/docker_jenkins.jenkins b/jenkinsfiles/docker_jenkins.jenkins index b3f74b8..f26f8ba 100644 --- a/jenkinsfiles/docker_jenkins.jenkins +++ b/jenkinsfiles/docker_jenkins.jenkins @@ -16,7 +16,7 @@ pipeline { steps { echo " ============== start building image ==================" dir ('docker/toolbox'){ - sh 'docker build . ' + sh 'docker build -t toolbox:latest . ' } } } From 172fca72c8efeaa3b5f0ea4d4dd01948f4929940 Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 18:01:36 +0300 Subject: [PATCH 10/16] add credentials --- jenkinsfiles/docker_jenkins.jenkins | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/jenkinsfiles/docker_jenkins.jenkins b/jenkinsfiles/docker_jenkins.jenkins index f26f8ba..d68608b 100644 --- a/jenkinsfiles/docker_jenkins.jenkins +++ b/jenkinsfiles/docker_jenkins.jenkins @@ -12,13 +12,30 @@ pipeline { timestamps() } stages { + stage("docker login") { + steps { + echo " ============== docker login ==================" + withCredentials([usernamePassword(credentialsId: 'dockerhub_nmore', 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 toolbox:latest . ' + sh 'docker build -t nmorework/toolbox:latest . ' } } } + stage("docker push") { + steps { + echo " ============== start pushing image ==================" + sh ''' + docker push nmorework/toolbox:latest + ''' + } + } } } From bc577b32ae9bd578fc3e23210b1d53dd292a7e62 Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 18:04:26 +0300 Subject: [PATCH 11/16] newes --- jenkinsfiles/docker_jenkins.jenkins | 54 +++++++++++++---------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/jenkinsfiles/docker_jenkins.jenkins b/jenkinsfiles/docker_jenkins.jenkins index d68608b..2155c23 100644 --- a/jenkinsfiles/docker_jenkins.jenkins +++ b/jenkinsfiles/docker_jenkins.jenkins @@ -1,41 +1,37 @@ -#!groovy -// Run docker build -properties([disableConcurrentBuilds()]) - pipeline { - agent { + agent { label 'master' - } - triggers{ pollSCM('* * * * *') } + } + triggers { + pollSCM('* * * * *') + } options { buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')) timestamps() } stages { - stage("docker login") { - steps { - echo " ============== docker login ==================" - withCredentials([usernamePassword(credentialsId: 'dockerhub_nmore', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - sh """ - docker login -u $USERNAME -p $PASSWORD - """ - } - } - stage("create docker image") { + stage("Docker Build and Push") { steps { - echo " ============== start building image ==================" - dir ('docker/toolbox'){ - sh 'docker build -t nmorework/toolbox:latest . ' - } + script { + try { + echo "============= Starting Docker Build and Push =============" + withCredentials([usernamePassword(credentialsId: 'dockerhub_nmore', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { + sh """ + docker login -u \$USERNAME -p \$PASSWORD + """ + } + + dir('docker/toolbox') { + sh 'docker build -t nmorework/toolbox:latest .' + } + + sh 'docker push nmorework/toolbox:latest' + } catch (Exception e) { + currentBuild.result = 'FAILURE' + error("Build and push failed: ${e.message}") + } } } - stage("docker push") { - steps { - echo " ============== start pushing image ==================" - sh ''' - docker push nmorework/toolbox:latest - ''' - } - } } + } } From 9a63a396854c3e4eda35fa07e7a0dcb27314b7c3 Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 18:05:47 +0300 Subject: [PATCH 12/16] nmorework/nmore tag --- jenkinsfiles/docker_jenkins.jenkins | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkinsfiles/docker_jenkins.jenkins b/jenkinsfiles/docker_jenkins.jenkins index 2155c23..83453d1 100644 --- a/jenkinsfiles/docker_jenkins.jenkins +++ b/jenkinsfiles/docker_jenkins.jenkins @@ -22,10 +22,10 @@ pipeline { } dir('docker/toolbox') { - sh 'docker build -t nmorework/toolbox:latest .' + sh 'docker build -t nmorework/nmore:latest .' } - sh 'docker push nmorework/toolbox:latest' + sh 'docker push nmorework/nmore:latest' } catch (Exception e) { currentBuild.result = 'FAILURE' error("Build and push failed: ${e.message}") From 86fe8e2e83e1d0786226ef399de78ecc71374efc Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 19:15:09 +0300 Subject: [PATCH 13/16] added postgesql --- docker/toolbox/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/toolbox/Dockerfile b/docker/toolbox/Dockerfile index 0f92007..2e4cc14 100644 --- a/docker/toolbox/Dockerfile +++ b/docker/toolbox/Dockerfile @@ -1,5 +1,5 @@ FROM alpine -RUN apk add --no-cache curl wget busybox-extras netcat-openbsd python3 py3-pip bash && \ +RUN apk add --no-cache curl wget busybox-extras netcat-openbsd python3 py3-pip bash postgresql-client && \ pip install awscli RUN apk --purge -v del py3-pip CMD tail -f /dev/null From 29ea58d16169df6c83bcb67b8d2ae1ce432051e2 Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 19:17:55 +0300 Subject: [PATCH 14/16] test 1 default branch --- docker/toolbox/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/toolbox/Dockerfile b/docker/toolbox/Dockerfile index 2e4cc14..0f92007 100644 --- a/docker/toolbox/Dockerfile +++ b/docker/toolbox/Dockerfile @@ -1,5 +1,5 @@ FROM alpine -RUN apk add --no-cache curl wget busybox-extras netcat-openbsd python3 py3-pip bash postgresql-client && \ +RUN apk add --no-cache curl wget busybox-extras netcat-openbsd python3 py3-pip bash && \ pip install awscli RUN apk --purge -v del py3-pip CMD tail -f /dev/null From 3c1d2bdf1f15eea1b8c9cf6938ad621df8cf53ca Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 19:21:05 +0300 Subject: [PATCH 15/16] Delete jenkinsfiles/docker_build.jenkins --- jenkinsfiles/docker_build.jenkins | 42 ------------------------------- 1 file changed, 42 deletions(-) delete mode 100644 jenkinsfiles/docker_build.jenkins diff --git a/jenkinsfiles/docker_build.jenkins b/jenkinsfiles/docker_build.jenkins deleted file mode 100644 index a0547c0..0000000 --- a/jenkinsfiles/docker_build.jenkins +++ /dev/null @@ -1,42 +0,0 @@ -#!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 " ============== docker 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 - ''' - } - } - } -} From 1c2cee99858857df9cb9c2e1f7e178e4efcd1b7c Mon Sep 17 00:00:00 2001 From: NMoreWork <141286601+NMoreWork@users.noreply.github.com> Date: Tue, 24 Oct 2023 19:21:13 +0300 Subject: [PATCH 16/16] Delete jenkinsfiles/docker_jenkins.jenkins --- jenkinsfiles/docker_jenkins.jenkins | 37 ----------------------------- 1 file changed, 37 deletions(-) delete mode 100644 jenkinsfiles/docker_jenkins.jenkins diff --git a/jenkinsfiles/docker_jenkins.jenkins b/jenkinsfiles/docker_jenkins.jenkins deleted file mode 100644 index 83453d1..0000000 --- a/jenkinsfiles/docker_jenkins.jenkins +++ /dev/null @@ -1,37 +0,0 @@ -pipeline { - agent { - label 'master' - } - triggers { - pollSCM('* * * * *') - } - options { - buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')) - timestamps() - } - stages { - stage("Docker Build and Push") { - steps { - script { - try { - echo "============= Starting Docker Build and Push =============" - withCredentials([usernamePassword(credentialsId: 'dockerhub_nmore', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { - sh """ - docker login -u \$USERNAME -p \$PASSWORD - """ - } - - dir('docker/toolbox') { - sh 'docker build -t nmorework/nmore:latest .' - } - - sh 'docker push nmorework/nmore:latest' - } catch (Exception e) { - currentBuild.result = 'FAILURE' - error("Build and push failed: ${e.message}") - } - } - } - } - } -}