From f7ec72f86e62a86c1ab5b0bc2a9e855d8353be64 Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:08:21 +0000 Subject: [PATCH 01/13] Testing --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index b8b0879..eb2b9f3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,9 +43,9 @@ - cd ~ - mkdir .ssh - chmod 700 .ssh - - echo K8S_SSH_PRIVATE_KEY >.ssh/id_rsa + - echo $$K8S_SSH_PRIVATE_KEY >.ssh/id_rsa - chmod 600 .ssh/id_rsa - - echo K8S_SSH_PUBLIC_KEY >.ssh/id_rsa.pub + - echo $$K8S_SSH_PUBLIC_KEY >.ssh/id_rsa.pub - chmod 600 .ssh/id_rsa.pub - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/mmflokati-flokati mmflokati-flokati=dr.dnix.de/mmflokati:$BRANCH-$REV -n northbrigade" - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/mmflokati-armleuchter mmflokati-armleuchter=dr.dnix.de/mmflokati:$BRANCH-$REV -n northbrigade" From adefe38a1c33ae3f43fb00dd9ea03109d8d085a5 Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:14:28 +0000 Subject: [PATCH 02/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index eb2b9f3..abeb5f5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,6 +2,7 @@ prebuild: image: golang:1.9 commands: + - echo $FOO - IMAGE=dr.dnix.de/$DRONE_REPO_NAME - REV=$(git rev-list HEAD --count) - BUILDDATE=$(date) From bbb98669c92a8c9a1563fdac1831af42bb6927e9 Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:15:57 +0000 Subject: [PATCH 03/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index abeb5f5..c80076d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ prebuild: image: golang:1.9 commands: - - echo $FOO + - echo ${foo} - IMAGE=dr.dnix.de/$DRONE_REPO_NAME - REV=$(git rev-list HEAD --count) - BUILDDATE=$(date) From 29fae9082162f69194353f2ee1652e4764c3f57a Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:22:56 +0000 Subject: [PATCH 04/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index c80076d..d6ee03c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,8 +1,10 @@ pipeline: prebuild: image: golang:1.9 + environment: + - FOO: ${FOO} commands: - - echo ${foo} + - echo $FOO - IMAGE=dr.dnix.de/$DRONE_REPO_NAME - REV=$(git rev-list HEAD --count) - BUILDDATE=$(date) @@ -33,6 +35,9 @@ - latest deploy: image: ubuntu:16.04 + environment: + - K8S_SSH_PRIVATE_KEY: ${K8S_SSH_PRIVATE_KEY} + - K8S_SSH_PUBLIC_KEY: ${K8S_SSH_PUBLIC_KEY} commands: - apt update - apt -y upgrade @@ -44,9 +49,9 @@ - cd ~ - mkdir .ssh - chmod 700 .ssh - - echo $$K8S_SSH_PRIVATE_KEY >.ssh/id_rsa + - echo "$K8S_SSH_PRIVATE_KEY" >.ssh/id_rsa - chmod 600 .ssh/id_rsa - - echo $$K8S_SSH_PUBLIC_KEY >.ssh/id_rsa.pub + - echo "$K8S_SSH_PUBLIC_KEY" >.ssh/id_rsa.pub - chmod 600 .ssh/id_rsa.pub - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/mmflokati-flokati mmflokati-flokati=dr.dnix.de/mmflokati:$BRANCH-$REV -n northbrigade" - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/mmflokati-armleuchter mmflokati-armleuchter=dr.dnix.de/mmflokati:$BRANCH-$REV -n northbrigade" From 879fabebfa264d949312a3b5105ff45eccaef2bf Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:23:49 +0000 Subject: [PATCH 05/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d6ee03c..373e8d4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ prebuild: image: golang:1.9 environment: - - FOO: ${FOO} + - FOO: ${foo} commands: - echo $FOO - IMAGE=dr.dnix.de/$DRONE_REPO_NAME From 56d695868f3eb8c92bb87e9c380373da3990bffa Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:24:37 +0000 Subject: [PATCH 06/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 373e8d4..b5470a3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ prebuild: image: golang:1.9 environment: - - FOO: ${foo} + - FOO: $foo commands: - echo $FOO - IMAGE=dr.dnix.de/$DRONE_REPO_NAME From fb2ce9be7674b93206ed0651dcf6c2f504fddb67 Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:28:17 +0000 Subject: [PATCH 07/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index b5470a3..77cb436 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,10 +1,7 @@ pipeline: prebuild: image: golang:1.9 - environment: - - FOO: $foo commands: - - echo $FOO - IMAGE=dr.dnix.de/$DRONE_REPO_NAME - REV=$(git rev-list HEAD --count) - BUILDDATE=$(date) @@ -34,7 +31,7 @@ tags: - latest deploy: - image: ubuntu:16.04 + image: busybox environment: - K8S_SSH_PRIVATE_KEY: ${K8S_SSH_PRIVATE_KEY} - K8S_SSH_PUBLIC_KEY: ${K8S_SSH_PUBLIC_KEY} From 178013c6af477a83a91beba9a547a0613a72c0f2 Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:29:23 +0000 Subject: [PATCH 08/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 77cb436..ca88ad3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,8 @@ pipeline: prebuild: image: golang:1.9 + environment: + - FOO: $$FOO commands: - IMAGE=dr.dnix.de/$DRONE_REPO_NAME - REV=$(git rev-list HEAD --count) From 86c14ea59ef74141163a5ba35bebe35f7cb0ae3d Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:32:09 +0000 Subject: [PATCH 09/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index ca88ad3..07af7e7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,8 +2,9 @@ prebuild: image: golang:1.9 environment: - - FOO: $$FOO + - FOO=$FOO commands: + - echo $FOO - IMAGE=dr.dnix.de/$DRONE_REPO_NAME - REV=$(git rev-list HEAD --count) - BUILDDATE=$(date) @@ -35,8 +36,8 @@ deploy: image: busybox environment: - - K8S_SSH_PRIVATE_KEY: ${K8S_SSH_PRIVATE_KEY} - - K8S_SSH_PUBLIC_KEY: ${K8S_SSH_PUBLIC_KEY} + - K8S_SSH_PRIVATE_KEY=${K8S_SSH_PRIVATE_KEY} + - K8S_SSH_PUBLIC_KEY=${K8S_SSH_PUBLIC_KEY} commands: - apt update - apt -y upgrade From 580390cbcdc0f841346ba9eb9143532b1ad78e70 Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:33:35 +0000 Subject: [PATCH 10/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 07af7e7..207d3ff 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,9 +2,9 @@ prebuild: image: golang:1.9 environment: - - FOO=$FOO + - FOO=${FOO} commands: - - echo $FOO + - echo ${FOO} - IMAGE=dr.dnix.de/$DRONE_REPO_NAME - REV=$(git rev-list HEAD --count) - BUILDDATE=$(date) @@ -49,9 +49,9 @@ - cd ~ - mkdir .ssh - chmod 700 .ssh - - echo "$K8S_SSH_PRIVATE_KEY" >.ssh/id_rsa + - echo "${K8S_SSH_PRIVATE_KEY}" >.ssh/id_rsa - chmod 600 .ssh/id_rsa - - echo "$K8S_SSH_PUBLIC_KEY" >.ssh/id_rsa.pub + - echo "${K8S_SSH_PUBLIC_KEY}" >.ssh/id_rsa.pub - chmod 600 .ssh/id_rsa.pub - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/mmflokati-flokati mmflokati-flokati=dr.dnix.de/mmflokati:$BRANCH-$REV -n northbrigade" - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/mmflokati-armleuchter mmflokati-armleuchter=dr.dnix.de/mmflokati:$BRANCH-$REV -n northbrigade" From 36c49938126fb396e22fee022c3446cd130c257c Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:37:24 +0000 Subject: [PATCH 11/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 207d3ff..3892c8b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ environment: - FOO=${FOO} commands: - - echo ${FOO} + - echo "$FOO" - IMAGE=dr.dnix.de/$DRONE_REPO_NAME - REV=$(git rev-list HEAD --count) - BUILDDATE=$(date) @@ -34,7 +34,7 @@ tags: - latest deploy: - image: busybox + image: ubuntu:16.04 environment: - K8S_SSH_PRIVATE_KEY=${K8S_SSH_PRIVATE_KEY} - K8S_SSH_PUBLIC_KEY=${K8S_SSH_PUBLIC_KEY} @@ -49,9 +49,9 @@ - cd ~ - mkdir .ssh - chmod 700 .ssh - - echo "${K8S_SSH_PRIVATE_KEY}" >.ssh/id_rsa + - echo "$K8S_SSH_PRIVATE_KEY" >.ssh/id_rsa - chmod 600 .ssh/id_rsa - - echo "${K8S_SSH_PUBLIC_KEY}" >.ssh/id_rsa.pub + - echo "$K8S_SSH_PUBLIC_KEY" >.ssh/id_rsa.pub - chmod 600 .ssh/id_rsa.pub - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/mmflokati-flokati mmflokati-flokati=dr.dnix.de/mmflokati:$BRANCH-$REV -n northbrigade" - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/mmflokati-armleuchter mmflokati-armleuchter=dr.dnix.de/mmflokati:$BRANCH-$REV -n northbrigade" From 22a2bf6f3f26607c6473e182d666b57be33bfc57 Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:40:48 +0000 Subject: [PATCH 12/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3892c8b..44edbf4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ prebuild: image: golang:1.9 environment: - - FOO=${FOO} + - FOO=${foo} commands: - echo "$FOO" - IMAGE=dr.dnix.de/$DRONE_REPO_NAME From b7dbf90b9030894464fa98fa6d7447b682996e07 Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 07:53:57 +0000 Subject: [PATCH 13/13] =?UTF-8?q?'.drone.yml'=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 44edbf4..9d224a4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,8 +1,8 @@ pipeline: prebuild: image: golang:1.9 - environment: - - FOO=${foo} + secrets: + - FOO commands: - echo "$FOO" - IMAGE=dr.dnix.de/$DRONE_REPO_NAME