Merge pull request #4 from GitRon/master

Dockerfile adjusted to use rancher-cli v2.0.4
ambient-innovation · Nov 13, 2018 · fcaab2f · fcaab2f
2 parents a871925 + f83f79a
commit fcaab2f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,9 @@
 # This is simply the rancher CLI plus kubectl
-FROM diemscott/rancher-cli-k8s:v2.0.2
+
+# Adapted docker setup from https://hub.docker.com/r/diemscott/rancher-cli-k8s/~/dockerfile/
+FROM lachlanevenson/k8s-kubectl:v1.11.4 AS k8scli
+FROM rancher/cli:v2.0.4
+COPY --from=k8scli /usr/local/bin/kubectl /usr/local/bin
 
 # We add envsubst which allows to replace environment variables, which is very handy when replacing congig
 # in Kubernetes yml files.