Skip to content

Commit

Permalink
Merge pull request #79 from AbsoluteSoftware/feature/update-golang-1-21
Browse files Browse the repository at this point in the history
  • Loading branch information
djeebus authored Oct 24, 2023
2 parents 0317661 + 4b42401 commit 5047e63
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# asdf plugin add earthly https://github.com/YR-ZR0/asdf-earthly
earthly 0.6.30
golang 1.19.3
golang 1.21.3
skaffold 2.0.3
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# builder image
FROM golang:1.19-alpine3.17 as builder
FROM golang:1.21.3-alpine3.18 AS builder

ARG COMMIT_SHA
ARG VERSION_TAG
Expand All @@ -12,7 +12,7 @@ WORKDIR /build
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags "-X ${GO_MOD_PATH}/config.CommitSHA=${COMMIT_SHA} -X ${GO_MOD_PATH}/config.Version=${VERSION_TAG}" -a -o prom-aggregation-gateway .

# generate clean, final image for end users
FROM alpine:3.17
FROM alpine:3.18
COPY --chown=nobody:nogroup --from=builder /build/prom-aggregation-gateway .

USER 65534
Expand Down
12 changes: 6 additions & 6 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ ARG commitSHA=""
ARG version="dev"
ARG PKG_PATH="github.com/zapier/prom-aggregation-gateway"

ARG ALPINE_VERSION="3.17.5"
ARG GOLANG_ALPINE_VERSION="3.17"
ARG ALPINE_VERSION="3.18.4"
ARG GOLANG_ALPINE_VERSION="3.18"
ARG CHART_RELEASER_VERSION="1.4.1"
ARG CHART_TESTING_VERSION="3.7.1"
ARG GITHUB_CLI_VERSION="2.20.2"
ARG GOLANG_VERSION="1.19.3"
ARG GITHUB_CLI_VERSION="2.36.0"
ARG GOLANG_VERSION="1.21.3"
ARG HELM_UNITTEST_VERSION="0.2.8"
ARG KUBECONFORM_VERSION="0.5.0"
ARG STATICCHECK_VERSION="0.3.3"
ARG STATICCHECK_VERSION="2023.1.6"

test:
BUILD +ci-golang
Expand Down Expand Up @@ -119,7 +119,7 @@ lint-golang:

# install staticcheck
RUN FILE=staticcheck.tgz \
&& URL=https://github.com/dominikh/go-tools/releases/download/v${STATICCHECK_VERSION}/staticcheck_linux_amd64.tar.gz \
&& URL=https://github.com/dominikh/go-tools/releases/download/${STATICCHECK_VERSION}/staticcheck_linux_amd64.tar.gz \
&& wget ${URL} \
--output-document ${FILE} \
&& tar \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/zapier/prom-aggregation-gateway

go 1.19
go 1.21

require (
github.com/gin-contrib/cors v1.4.0
Expand Down
20 changes: 5 additions & 15 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5047e63

Please sign in to comment.