Skip to content

Commit

Permalink
ci: Update Go to 1.18
Browse files Browse the repository at this point in the history
  • Loading branch information
bemyak committed Oct 18, 2022
1 parent 9702e7f commit ad9fa71
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .github/actions/amazon-linux-build-action/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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 \
Expand Down

0 comments on commit ad9fa71

Please sign in to comment.