From 977e11141c14df5864f0180f725961da6c47c467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ask=20Bj=C3=B8rn=20Hansen?= Date: Tue, 6 Jun 2023 18:02:26 -0700 Subject: [PATCH] Update Go and dependencies --- .drone.yml | 8 +++++++- Dockerfile | 4 ++-- go.mod | 2 +- go.sum | 2 ++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0e0a225..1c546a9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,10 +1,11 @@ +--- kind: pipeline type: kubernetes name: default steps: - name: test - image: golang:1.19.5 + image: golang:1.20.5 volumes: - name: deps path: /go @@ -28,3 +29,8 @@ steps: from_secret: harbor_username password: from_secret: harbor_password +--- +kind: signature +hmac: 004f812ff29a1e2546eeafbf449c36c901f69b5f2591f83152eebde7258453fd + +... diff --git a/Dockerfile b/Dockerfile index 4732353..e292554 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM golang:1.19.5-alpine AS build +FROM golang:1.20.5-alpine AS build RUN apk --no-cache add git WORKDIR /go/src/github.com/abh/geoipapi ADD . /go/src/github.com/abh/geoipapi RUN go install -v ./... -FROM alpine:3.17.1 +FROM alpine:3.18 USER root RUN apk --no-cache add ca-certificates diff --git a/go.mod b/go.mod index 9c0c0a2..68679ed 100644 --- a/go.mod +++ b/go.mod @@ -6,5 +6,5 @@ require github.com/oschwald/geoip2-golang v1.8.0 require ( github.com/oschwald/maxminddb-golang v1.10.0 // indirect - golang.org/x/sys v0.4.0 // indirect + golang.org/x/sys v0.8.0 // indirect ) diff --git a/go.sum b/go.sum index 147c236..e7f654a 100644 --- a/go.sum +++ b/go.sum @@ -7,4 +7,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=