Skip to content

Commit 745e187

Browse files
authored
Update to go-1.20, alpine 3.18 and go modules (#14)
* Update to go-1.20, alpine 3.18 and go modules * modules update
1 parent 2ffed5d commit 745e187

File tree

4 files changed

+98
-190
lines changed

4 files changed

+98
-190
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ jobs:
2020
name: Build
2121
runs-on: ubuntu-latest
2222
steps:
23-
- name: Set up Go 1.19
24-
uses: actions/setup-go@v2
23+
- name: Set up Go 1.20
24+
uses: actions/setup-go@v4
2525
with:
26-
go-version: 1.19
26+
go-version: "1.20"
2727
id: go
2828

2929
- name: Check out code into the Go module directory
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
3131

3232
- name: Lint
33-
uses: golangci/golangci-lint-action@v2
33+
uses: golangci/golangci-lint-action@v3
3434
with:
3535
args: -p bugs -p unused --timeout=3m
3636

3737
- name: Log in to the Container registry
38-
uses: docker/login-action@v1
38+
uses: docker/login-action@v2
3939
with:
4040
registry: ${{ env.REGISTRY }}
4141
username: ${{ github.actor }}
@@ -48,7 +48,7 @@ jobs:
4848
[ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true
4949
5050
- name: Build and push image
51-
uses: docker/build-push-action@v2
51+
uses: docker/build-push-action@v4
5252
with:
5353
context: .
5454
push: true

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM golang:1.19-bullseye as builder
1+
FROM golang:1.20-bullseye as builder
22
WORKDIR /work
33
COPY . .
44
RUN apt update \
55
&& apt install --yes --no-install-recommends \
66
liblzma-dev \
77
&& make ipxe pixie
88

9-
FROM alpine:3.16
9+
FROM alpine:3.18
1010
RUN apk -U add ca-certificates
1111
COPY --from=builder /work/build/pixie /pixie
1212
ENTRYPOINT ["/pixie"]

go.mod

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,49 @@
11
module github.com/metal-stack/pixie
22

3-
go 1.19
3+
go 1.20
44

55
require (
6-
github.com/metal-stack/metal-api v0.21.4
6+
github.com/metal-stack/metal-api v0.22.6
77
github.com/metal-stack/v v1.0.3
88
github.com/pin/tftp/v3 v3.0.0
9-
github.com/prometheus/client_golang v1.13.0
10-
github.com/spf13/cobra v1.6.1
11-
github.com/spf13/viper v1.13.0
12-
github.com/stretchr/testify v1.8.1
13-
go.uber.org/zap v1.23.0
14-
golang.org/x/crypto v0.1.0
15-
golang.org/x/net v0.1.0
16-
google.golang.org/grpc v1.50.1
9+
github.com/prometheus/client_golang v1.16.0
10+
github.com/spf13/cobra v1.7.0
11+
github.com/spf13/viper v1.16.0
12+
github.com/stretchr/testify v1.8.4
13+
go.uber.org/zap v1.24.0
14+
golang.org/x/crypto v0.10.0
15+
golang.org/x/net v0.11.0
16+
google.golang.org/grpc v1.56.1
1717
)
1818

1919
require (
20-
github.com/benbjohnson/clock v1.3.0 // indirect
20+
github.com/benbjohnson/clock v1.3.5 // indirect
2121
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
22+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2323
github.com/davecgh/go-spew v1.1.1 // indirect
2424
github.com/fsnotify/fsnotify v1.6.0 // indirect
25-
github.com/golang/protobuf v1.5.2 // indirect
25+
github.com/golang/protobuf v1.5.3 // indirect
2626
github.com/hashicorp/hcl v1.0.0 // indirect
27-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
28-
github.com/magiconair/properties v1.8.6 // indirect
27+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
28+
github.com/magiconair/properties v1.8.7 // indirect
2929
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
3030
github.com/mitchellh/mapstructure v1.5.0 // indirect
31-
github.com/pelletier/go-toml v1.9.5 // indirect
32-
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
31+
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
3332
github.com/pmezard/go-difflib v1.0.0 // indirect
34-
github.com/prometheus/client_model v0.3.0 // indirect
35-
github.com/prometheus/common v0.37.0 // indirect
36-
github.com/prometheus/procfs v0.8.0 // indirect
37-
github.com/spf13/afero v1.9.2 // indirect
38-
github.com/spf13/cast v1.5.0 // indirect
33+
github.com/prometheus/client_model v0.4.0 // indirect
34+
github.com/prometheus/common v0.44.0 // indirect
35+
github.com/prometheus/procfs v0.11.0 // indirect
36+
github.com/spf13/afero v1.9.5 // indirect
37+
github.com/spf13/cast v1.5.1 // indirect
3938
github.com/spf13/jwalterweatherman v1.1.0 // indirect
4039
github.com/spf13/pflag v1.0.5 // indirect
41-
github.com/subosito/gotenv v1.4.1 // indirect
42-
go.uber.org/atomic v1.10.0 // indirect
43-
go.uber.org/multierr v1.8.0 // indirect
44-
golang.org/x/sys v0.1.0 // indirect
45-
golang.org/x/text v0.4.0 // indirect
46-
google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71 // indirect
47-
google.golang.org/protobuf v1.28.1 // indirect
40+
github.com/subosito/gotenv v1.4.2 // indirect
41+
go.uber.org/atomic v1.11.0 // indirect
42+
go.uber.org/multierr v1.11.0 // indirect
43+
golang.org/x/sys v0.9.0 // indirect
44+
golang.org/x/text v0.10.0 // indirect
45+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529 // indirect
46+
google.golang.org/protobuf v1.31.0 // indirect
4847
gopkg.in/ini.v1 v1.67.0 // indirect
49-
gopkg.in/yaml.v2 v2.4.0 // indirect
5048
gopkg.in/yaml.v3 v3.0.1 // indirect
5149
)

0 commit comments

Comments
 (0)