From 2895ba9ff468c9df8a8b8357aeab9199091b9360 Mon Sep 17 00:00:00 2001 From: Ambrose Chua Date: Sun, 1 Apr 2018 21:12:22 +0800 Subject: [PATCH] Add kubectl and hide dockerfile --- Dockerfile => .dockerfile | 8 +++++++- .drone.yml | 1 + .gitconfig | 2 ++ .gitignore | 3 +++ .install/kubectl.sh | 16 ++++++++++++++++ .install/yadm.sh | 5 +++++ .versions | 2 ++ .yadm/encrypt | 2 ++ 8 files changed, 38 insertions(+), 1 deletion(-) rename Dockerfile => .dockerfile (86%) create mode 100644 .gitignore create mode 100755 .install/kubectl.sh create mode 100644 .yadm/encrypt diff --git a/Dockerfile b/.dockerfile similarity index 86% rename from Dockerfile rename to .dockerfile index e1cbcd7..25394d1 100644 --- a/Dockerfile +++ b/.dockerfile @@ -19,7 +19,11 @@ RUN ./.install/yadm.sh RUN ./.install/golang.sh RUN ./.install/node.sh RUN ./.install/python.sh -# setup global PATH for system programs +# tools +RUN ./.install/kubectl.sh + +# setup global PATH for system tools + ENV PATH=/usr/local/go/bin:$PATH # create user @@ -29,8 +33,10 @@ USER ambrose # install user programs +# shell, editor RUN ./.install/zsh-pure.sh RUN ./.install/plug.sh +# tools RUN ./.install/vgo.sh RUN ./.install/packr.sh RUN ./.install/caddy.sh diff --git a/.drone.yml b/.drone.yml index 033f07e..c07cd74 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,6 +3,7 @@ pipeline: image: plugins/docker registry: registry.labs.0x.no repo: registry.labs.0x.no/env + dockerfile: .dockerfile tags: - latest diff --git a/.gitconfig b/.gitconfig index 6341d5c..7becdb1 100644 --- a/.gitconfig +++ b/.gitconfig @@ -3,3 +3,5 @@ [user] name = Ambrose Chua useConfigOnly = true +[core] + editor = nvim diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d708b3d --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.ssh/known_hosts +.kube/cache +.kube/http-cache diff --git a/.install/kubectl.sh b/.install/kubectl.sh new file mode 100755 index 0000000..aae664d --- /dev/null +++ b/.install/kubectl.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e +source ./.versions + +echo +echo "Installing kubectl $KUBECTL_VERSION..." +echo + +apk add --no-cache --virtual .build-deps \ + curl + +curl -fLo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl +chmod a+x /usr/local/bin/kubectl + +apk del .build-deps diff --git a/.install/yadm.sh b/.install/yadm.sh index 2403afb..24ad315 100755 --- a/.install/yadm.sh +++ b/.install/yadm.sh @@ -7,9 +7,14 @@ echo echo "Installing yadm..." echo +apk add --no-cache --virtual .build-deps \ + curl + apk add --no-cache \ git \ bash curl -fLo /usr/local/bin/yadm https://github.com/TheLocehiliosan/yadm/raw/master/yadm chmod a+x /usr/local/bin/yadm + +apk del .build-deps diff --git a/.versions b/.versions index 740aeac..d36d63a 100755 --- a/.versions +++ b/.versions @@ -7,5 +7,7 @@ export GOLANG_VERSION=1.10 export NODE_VERSION=9.10.1 export YARN_VERSION=1.5.1 +export KUBECTL_VERSION=1.10.0 + export CADDY_VERSION=0.10.12 diff --git a/.yadm/encrypt b/.yadm/encrypt new file mode 100644 index 0000000..5c02fca --- /dev/null +++ b/.yadm/encrypt @@ -0,0 +1,2 @@ +.ssh/*.key +.kube/config