From b9be844632c9f4266906fb67dddb1b95d0da79dc Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Thu, 7 Apr 2022 13:15:22 -0700
Subject: [PATCH] Update versions

---
 Dockerfile                   | 2 +-
 Dockerfile.personal          | 9 +++------
 scripts/add_golang.sh        | 6 +++---
 scripts/add_golangci_lint.sh | 2 +-
 scripts/add_hadolint.sh      | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 47b794a..3c7b940 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,6 @@ FROM python:3
 RUN mkdir -p /data/pre-commit-cache
 ENV PRE_COMMIT_HOME=/data/pre-commit-cache
 
-RUN pip install --no-cache-dir pre-commit==2.10.1
+RUN pip install --no-cache-dir pre-commit==2.18.1
 
 CMD ["pre-commit", "run", "--all-files"]
diff --git a/Dockerfile.personal b/Dockerfile.personal
index 0d36baa..371610b 100644
--- a/Dockerfile.personal
+++ b/Dockerfile.personal
@@ -4,10 +4,7 @@ FROM ${BASE_IMAGE}:base
 # Add helper scripts
 COPY ./scripts /scripts
 
-# 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
+RUN /scripts/add_golang.sh && \
+        /scripts/add_hadolint.sh && \
+        /scripts/add_golangci_lint.sh
diff --git a/scripts/add_golang.sh b/scripts/add_golang.sh
index 484aa66..7edc70d 100755
--- a/scripts/add_golang.sh
+++ b/scripts/add_golang.sh
@@ -1,11 +1,11 @@
 #! /bin/bash
 set -ex
 
-VERSION=1.16
-SHASUM=013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2
+VERSION=1.18
+SHASUM=e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f
 
 FILENAME=go${VERSION}.linux-amd64.tar.gz
-GOURL=https://golang.org/dl/${FILENAME}
+GOURL=https://go.dev/dl/${FILENAME}
 
 wget --quiet "$GOURL"
 
diff --git a/scripts/add_golangci_lint.sh b/scripts/add_golangci_lint.sh
index d10d857..1d9267d 100755
--- a/scripts/add_golangci_lint.sh
+++ b/scripts/add_golangci_lint.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 set -ex
 
-VERSION=v1.37.0
+VERSION=v1.45.2
 
 curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "/usr/bin" "${VERSION}"
diff --git a/scripts/add_hadolint.sh b/scripts/add_hadolint.sh
index 88ee09e..192499b 100755
--- a/scripts/add_hadolint.sh
+++ b/scripts/add_hadolint.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 set -ex
 
-VERSION=v2.8.0
+VERSION=v2.10.0
 wget -q -L -O /usr/bin/hadolint "https://github.com/hadolint/hadolint/releases/download/${VERSION}/hadolint-Linux-x86_64"
 chmod +x /usr/bin/hadolint