[tsh] Initial support for teleport tsh (#452)

cloudposse · Apr 17, 2019 · 5c91f56 · 5c91f56
1 parent 1f9c28d
commit 5c91f56
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ FROM google/cloud-sdk:241.0.0-alpine as google-cloud-sdk
 #
 # Cloud Posse Package Distribution
 #
-FROM cloudposse/packages:0.87.0 as packages
+FROM cloudposse/packages:0.89.1 as packages
 
 WORKDIR /packages
 

diff --git a/geodesic_apkindex.md5 b/geodesic_apkindex.md5
@@ -1 +1 @@
-7b7682ed95935a145df2d4bac8ff88cd
+b7d17e808fd428fec858a3e7a15997b5
diff --git a/packages.txt b/packages.txt
@@ -60,6 +60,7 @@ stern@cloudposse
 sudo
 syslog-ng
 tar
+teleport@cloudposse
 terraform@cloudposse
 terragrunt@cloudposse
 terrahelp@cloudposse

diff --git a/rootfs/etc/profile.d/tsh-login.sh b/rootfs/etc/profile.d/tsh-login.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+function tsh-login() {
+	tsh login --bind-addr=:${GEODESIC_PORT} --proxy=${TELEPORT_PROXY_DOMAIN_NAME:-tele.${DOCKER_IMAGE#*.}} $*
+}
diff --git a/rootfs/templates/wrapper b/rootfs/templates/wrapper
@@ -150,7 +150,7 @@ function use() {
 		--publish ${GEODESIC_PORT}:${GEODESIC_PORT}
 		--name "${DOCKER_NAME}"
 		--rm
-		--env KUBERNETES_API_PORT=${GEODESIC_PORT})
+		--env GEODESIC_PORT=${GEODESIC_PORT})
 
 	trap run_exit_hooks EXIT
 	# the extra curly braces around .ID are because this file goes through go template substitution local before being installed as a shell script