From e82b8757c29b5afedae39a497fa094958ab747c3 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Tue, 2 Feb 2021 15:42:48 -0800
Subject: [PATCH] Install golang from tar

---
 Dockerfile.personal          | 11 +++++------
 scripts/add_golang.sh        | 20 ++++++++++++++++++++
 scripts/add_golangci_lint.sh |  1 +
 scripts/add_hadolint.sh      |  2 +-
 4 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100755 scripts/add_golang.sh

diff --git a/Dockerfile.personal b/Dockerfile.personal
index 5a9bc08..0d36baa 100644
--- a/Dockerfile.personal
+++ b/Dockerfile.personal
@@ -1,14 +1,13 @@
 ARG BASE_IMAGE=iamthefij/drone-pre-commit
 FROM ${BASE_IMAGE}:base
 
-RUN apt-get update && \
-        apt-get install -y --no-install-recommends golang=2:1.11~1 && \
-        apt-get clean && \
-        rm -rf /var/lib/apt/lists/*
-
 # Add helper scripts
 COPY ./scripts /scripts
 
-# Bundle hadolint
+# Add golang
+RUN /scripts/add_golang.sh
+ENV PATH=$PATH:/usr/local/go/bin
+
+# Add some other linters
 RUN /scripts/add_hadolint.sh
 RUN /scripts/add_golangci_lint.sh
diff --git a/scripts/add_golang.sh b/scripts/add_golang.sh
new file mode 100755
index 0000000..cae5042
--- /dev/null
+++ b/scripts/add_golang.sh
@@ -0,0 +1,20 @@
+#! /bin/bash
+set -ex
+
+VERSION=1.15.7
+SHASUM=0d142143794721bb63ce6c8a6180c4062bcf8ef4715e7d6d6609f3a8282629b3
+
+FILENAME=go${VERSION}.linux-amd64.tar.gz
+GOURL=https://golang.org/dl/${FILENAME}
+
+wget --quiet "$GOURL"
+
+# Check sum
+echo "$SHASUM  ./$FILENAME" > "${FILENAME}.sum"
+shasum -c "./${FILENAME}.sum"
+
+# Install
+tar -C /usr/local -xzf "./$FILENAME"
+
+# Clean up
+rm "$FILENAME" "${FILENAME}.sum"
diff --git a/scripts/add_golangci_lint.sh b/scripts/add_golangci_lint.sh
index 2b73a22..1449fc3 100755
--- a/scripts/add_golangci_lint.sh
+++ b/scripts/add_golangci_lint.sh
@@ -1,4 +1,5 @@
 #! /bin/bash
+set -ex
 
 VERSION=v1.35.2
 
diff --git a/scripts/add_hadolint.sh b/scripts/add_hadolint.sh
index f1e297f..0b0be08 100755
--- a/scripts/add_hadolint.sh
+++ b/scripts/add_hadolint.sh
@@ -2,5 +2,5 @@
 set -ex
 
 VERSION=v1.18.0
-wget -L -O /usr/bin/hadolint "https://github.com/hadolint/hadolint/releases/download/${VERSION}/hadolint-Linux-x86_64"
+wget -q -L -O /usr/bin/hadolint "https://github.com/hadolint/hadolint/releases/download/${VERSION}/hadolint-Linux-x86_64"
 chmod +x /usr/bin/hadolint