Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump golang to 1.21.3 and alpine to 3.18 #79

Merged
merged 7 commits into from
Oct 24, 2023
Merged

Bump golang to 1.21.3 and alpine to 3.18 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a9ff59
Bump golang to 1.21.2 and alpine to 3.18
neiljain Oct 7, 2023
815a1d7
Bump earthfile to use latest versions
neiljain Oct 7, 2023
523e439
Revert earthly version back to 0.6
neiljain Oct 8, 2023
ceeed93
Bump golang to 1.21.3
neiljain Oct 10, 2023
f4644c4
Fix staticcheck 2023.1.6 download URL
neiljain Oct 11, 2023
9d6f47c
Revert quintush/helm-unittest to v0.2.11
neiljain Oct 11, 2023
4b42401
Revert helm chart testing versions
neiljain Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tool-versions
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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

Loading