From 2f0f1889f14436b903c38c6db900e2571433d563 Mon Sep 17 00:00:00 2001
From: Sergei Gureev <sergei.gureev@sharpershape.com>
Date: Thu, 9 Jun 2022 11:07:46 +0300
Subject: [PATCH] ci: update Go to 1.18

---
 .github/actions/amazon-linux-build-action/Dockerfile | 12 ++++++------
 Dockerfile                                           |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/actions/amazon-linux-build-action/Dockerfile b/.github/actions/amazon-linux-build-action/Dockerfile
index d60d245fb..c9d64cfbd 100644
--- a/.github/actions/amazon-linux-build-action/Dockerfile
+++ b/.github/actions/amazon-linux-build-action/Dockerfile
@@ -5,13 +5,13 @@ FROM amazonlinux:latest
 RUN yum install -y tar gzip gcc
 
 # install Go
-ENV GOLANG_VERSION 1.16.6
-ENV GOLANG_VERSION_SHA256 be333ef18b3016e9d7cb7b1ff1fdb0cac800ca0be4cf2290fe613b3d069dfe0d
+ENV GOLANG_VERSION 1.18.3
+ENV GOLANG_VERSION_SHA256 956f8507b302ab0bb747613695cdae10af99bbd39a90cae522b7c0302cc27245
 
-RUN curl -o golang.tar.gz https://dl.google.com/go/go$GOLANG_VERSION.linux-amd64.tar.gz \
-	&& echo "$GOLANG_VERSION_SHA256 golang.tar.gz" | sha256sum --strict --check \
-	&& tar -C /usr/local -xzf golang.tar.gz \
-	&& rm golang.tar.gz
+RUN curl -O https://dl.google.com/go/go$GOLANG_VERSION.linux-amd64.tar.gz \
+	&& echo "$GOLANG_VERSION_SHA256 go$GOLANG_VERSION.linux-amd64.tar.gz" | sha256sum --strict --check \
+	&& tar -C /usr/local -xzf go$GOLANG_VERSION.linux-amd64.tar.gz \
+	&& rm go$GOLANG_VERSION.linux-amd64.tar.gz
 
 ENV PATH /usr/local/go/bin:$PATH
 
diff --git a/Dockerfile b/Dockerfile
index 4556bf2c5..3ed1bad8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@
 #  $ docker run -v /path/to/docker-config:/opt/tegola_config -p 8080 tegola serve
 
 # Intermediary container for building
-FROM golang:1.16.2-alpine3.12 AS build
+FROM golang:1.18-alpine3.16 AS build
 
 ARG BUILDPKG="github.com/go-spatial/tegola/internal/build"
 ARG VER="Version Not Set"
@@ -42,8 +42,8 @@ ENV BUILD_PKG="${BUILDPKG}"
 # incurs approximately 1:30 extra build time (1:54 vs 0:27) to install packages.  Doesn't impact
 # development as these layers are drawn from cache after the first build.
 RUN apk update \
-	&& apk add musl-dev=1.1.24-r10 \
-	&& apk add gcc=9.3.0-r2
+	&& apk add musl-dev=1.2.3-r0 \
+	&& apk add gcc=11.2.1_git20220219-r2
 
 # Set up source for compilation
 RUN mkdir -p /go/src/github.com/go-spatial/tegola
@@ -61,7 +61,7 @@ RUN cd /go/src/github.com/go-spatial/tegola/cmd/tegola \
 	&& chmod a+x /opt/tegola
 
 # Create minimal deployment image, just alpine & the binary
-FROM alpine:3.12
+FROM alpine:3.16
 
 RUN apk update \
 	&& apk add ca-certificates \