From add2177fd95e98b22826623072c536ba504e368b Mon Sep 17 00:00:00 2001 From: an Date: Sat, 24 Feb 2018 10:17:53 +0100 Subject: [PATCH] Readded vendors --- .drone.yml | 10 ++++++++-- .gitmodules | 6 ++++++ vendor/git.dnix.de/an/flokatilib | 1 + vendor/git.dnix.de/an/xlog | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) create mode 160000 vendor/git.dnix.de/an/flokatilib create mode 160000 vendor/git.dnix.de/an/xlog diff --git a/.drone.yml b/.drone.yml index b8b0879..9d224a4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,10 @@ pipeline: prebuild: image: golang:1.9 + secrets: + - FOO commands: + - echo "$FOO" - IMAGE=dr.dnix.de/$DRONE_REPO_NAME - REV=$(git rev-list HEAD --count) - BUILDDATE=$(date) @@ -32,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 @@ -43,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" diff --git a/.gitmodules b/.gitmodules index e69de29..e126cdc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "vendor/git.dnix.de/an/xlog"] + path = vendor/git.dnix.de/an/xlog + url = https://git.dnix.de/an/xlog +[submodule "vendor/git.dnix.de/an/flokatilib"] + path = vendor/git.dnix.de/an/flokatilib + url = https://git.dnix.de/an/flokatilib diff --git a/vendor/git.dnix.de/an/flokatilib b/vendor/git.dnix.de/an/flokatilib new file mode 160000 index 0000000..208f2d0 --- /dev/null +++ b/vendor/git.dnix.de/an/flokatilib @@ -0,0 +1 @@ +Subproject commit 208f2d03774d1637ef66e1bf7ef41b7efcee0192 diff --git a/vendor/git.dnix.de/an/xlog b/vendor/git.dnix.de/an/xlog new file mode 160000 index 0000000..e754765 --- /dev/null +++ b/vendor/git.dnix.de/an/xlog @@ -0,0 +1 @@ +Subproject commit e7547652aef671a5acb3fa66625b007c2c75251c