From 4e7cbf573398c8a3173354cc8d12f62486e3dab1 Mon Sep 17 00:00:00 2001
From: Ambrose Chua <ambrose@chua.family>
Date: Fri, 30 Mar 2018 00:19:38 +0800
Subject: [PATCH] Add vgo, remove install wrapper

---
 .install/install.sh | 20 --------------------
 .install/vgo.sh     |  9 +++++++++
 Dockerfile          | 12 +++++++++++-
 3 files changed, 20 insertions(+), 21 deletions(-)
 delete mode 100755 .install/install.sh
 create mode 100755 .install/vgo.sh

diff --git a/.install/install.sh b/.install/install.sh
deleted file mode 100755
index 76ecf51..0000000
--- a/.install/install.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-BASE_DIR="$(dirname $0)"
-source ./.versions
-
-for f in $BASE_DIR/*; do
-
-	BASE_NAME="$(basename $f)"
-	if [ "$BASE_NAME" = "install.sh" ]; then
-		continue
-	fi
-
-	echo 
-	echo "Running $BASE_NAME..."
-
-	$f
-
-done
diff --git a/.install/vgo.sh b/.install/vgo.sh
new file mode 100755
index 0000000..c01c9ed
--- /dev/null
+++ b/.install/vgo.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+echo
+echo "Installing vgo..."
+echo
+
+go get -u golang.org/x/vgo
diff --git a/Dockerfile b/Dockerfile
index 31a9a2d..12fc6ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,13 +8,23 @@ COPY . .
 
 # Install tools from source
 
-RUN ./.install/install.sh
+RUN source ./.version
+
+RUN ./.install/zsh.sh
+RUN ./.install/neovim.sh
+RUN ./.install/golang.sh
+RUN ./.install/node.sh
+RUN ./.install/python.sh
 
 # Create user
 
 RUN adduser -s /bin/zsh -D ambrose
 USER ambrose
 
+# Install user tools
+
+RUN ./.install/vgo.sh
+
 # Open shell by default
 
 CMD ["/bin/zsh"]