release 2019-11-05_01 (#10)

ksandermann · Nov 5, 2019 · 55cc778 · 55cc778
1 parent 41bcea7
commit 55cc778
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git a/.autoexec.sh b/.autoexec.sh
@@ -0,0 +1 @@
+echo "hello from autoexec"
diff --git a/.bashrc b/.bashrc
@@ -7,6 +7,7 @@ do
 	ssh-add "/root/.ssh/$key"
 done
 
+
 ######################################################## ALIASES #######################################################
 
 #GENERIC
@@ -149,5 +150,10 @@ echo "oc bash completion installed!"
 terraform -install-autocomplete
 echo "terraform bash completion installed!"
 
+######################################################## SOURCE ########################################################
 sleep 1
-echo "/root/.bashrc loaded succesfully!"
+if [ -f "/root/.autoexec.sh" ]; then
+    source /root/.autoexec.sh
+fi
+
+echo "/root/.bashrc loaded successfully!"
diff --git a/Dockerfile b/Dockerfile
@@ -4,16 +4,16 @@ ARG UBUNTU_VERSION=18.04
 
 ARG OC_CLI_SOURCE="https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz"
 
-ARG HELM_VERSION="2.14.3"
-ARG TERRAFORM_VERSION="0.12.9"
-ARG OPENSSH_VERSION="8.0p1"
-ARG KUBECTL_VERSION="1.16.0"
-ARG ANSIBLE_VERSION="2.8.5"
-ARG JINJA_VERSION="2.10.1"
-ARG AZ_CLI_VERSION="2.0.73-1~bionic"
-ARG AWS_CLI_VERSION="1.16.239"
-ARG DOCKER_VERSION="19.03.2"
-ARG KOPS_VERSION="1.13.0"
+ARG HELM_VERSION="2.15.2"
+ARG TERRAFORM_VERSION="0.12.13"
+ARG OPENSSH_VERSION="8.1p1"
+ARG KUBECTL_VERSION="1.16.2"
+ARG ANSIBLE_VERSION="2.9.0"
+ARG JINJA_VERSION="2.10.3"
+ARG AZ_CLI_VERSION="2.0.76-1~bionic"
+ARG AWS_CLI_VERSION="1.16.273"
+ARG DOCKER_VERSION="19.03.4"
+ARG KOPS_VERSION="1.14.0"
 
 ARG TILLER_NAMESPACE=kubetools
 

diff --git a/README.md b/README.md
@@ -4,6 +4,9 @@ This is basically the toolchain I am working with on a daily basis, packed into
 platform-independent development environment.
 Feel free to use/share/contribute.
 
+# custom .bashrc
+By default, any file mounted into /root/.autoexec.sh will be sourced inside the .bashrc of the container. 
+
 # Versioning 
 Release tags will be build following pattern YYYY-MM-dd-version.
 Version 1.0 of a date will always contain the latest stable/official versions of tooling available.
@@ -13,6 +16,7 @@ below.
 ## Version history
 | RELEASE       | UBUNTU | DOCKER   | KUBECTL  | OC CLI | HELM   | TERRAFORM | AWS CLI  | AZ CLI | KOPS   | ANSIBLE | JINJA2 | OPENSSH | TILLER_NAMESPACE |
 |---------------|--------|----------|----------|--------|--------|-----------|----------|--------|--------|---------|--------|---------|------------------|
+| 2019-11-05_01 | 18.04  | 19.03.4  | 1.16.2   | 3.11   | 2.15.2 | 0.12.13   | 1.16.273 | 2.0.76 | 1.14.0 | 2.9.0   | 2.10.3 | 8.1p1   | kubetools        |
 | 2019-09-19_01 | 18.04  | 19.03.2  | 1.16.0   | 3.11   | 2.14.3 | 0.12.9    | 1.16.239 | 2.0.73 | 1.13.0 | 2.8.5   | 2.10.1 | 8.0p1   | kubetools        |
 | 2019-09-19_02 | 18.04  | 19.03.2  | 1.13.10  | 3.11   | 2.14.3 | 0.12.9    | 1.16.239 | 2.0.73 | 1.13.0 | 2.8.5   | 2.10.1 | 8.0p1   | kubetools        |
 | 2019-09-17_01 | 18.04  | 19.03.2  | 1.15.3   | 3.11   | 2.14.3 | 0.12.8    | 1.16.239 | 2.0.73 | 1.13.0 | 2.8.5   | 2.10.1 | 8.0p1   | kubetools        |

diff --git a/build.sh b/build.sh
@@ -2,15 +2,15 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-IMAGE_TAG="2019-09-19_01"
+IMAGE_TAG="2019-11-05_01"
 
 docker build \
     --pull \
     --no-cache \
     -t ksandermann/cloud-toolbox:$IMAGE_TAG \
     .
 
-##push
+#push
 docker login
 docker push ksandermann/cloud-toolbox:$IMAGE_TAG
 

diff --git a/run.sh b/run.sh
@@ -11,8 +11,10 @@ docker run -ti --rm \
     -v ~/.ssh:/root/.ssh \
     -v ${PWD}:/root/project \
     -v ~/.gitconfig:/root/.gitconfig \
+    -v ${PWD}/.autoexec.sh:/root/.autoexec.sh \
     -v ~/.aws:/root/.aws \
     -v ~/.azure:/root/.azure \
     -v /var/run/docker.sock:/var/run/docker.sock \
+    --env-file <(env | grep proxy) \
     ksandermann/cloud-toolbox:$IMAGE_TAG \
     bash