Skip to content

Commit 2eaf8da

Browse files
authored
fix/deps: update containers packages
Fixes CVE-2024-3727.
1 parent 8779f77 commit 2eaf8da

File tree

3 files changed

+318
-163
lines changed

3 files changed

+318
-163
lines changed

.github/workflows/go.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,23 @@ jobs:
1010

1111
build:
1212
runs-on: ubuntu-latest
13+
container: ghcr.io/vanilla-os/pico:main
1314

1415
steps:
1516
- uses: actions/checkout@v4
1617

1718
- name: Set up Go
1819
uses: actions/setup-go@v5
1920
with:
20-
go-version: 1.21
21+
go-version: 1.22
2122

2223
- name: Install build dependencies
2324
run: |
24-
sudo apt-get update
25-
sudo apt-get install -y libbtrfs-dev libdevmapper-dev libgpgme-dev
25+
apt-get update
26+
apt-get install -y podman build-essential pkg-config libbtrfs-dev libdevmapper-dev libgpgme-dev
2627
2728
- name: Build
28-
run: sudo go build -v ./...
29+
run: go build -v ./...
2930

3031
- name: Test
31-
run: sudo go test -v ./tests/...
32+
run: go test -v ./tests/...

go.mod

Lines changed: 55 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,88 @@
11
module github.com/vanilla-os/prometheus
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.3
46

57
require (
6-
github.com/containers/buildah v1.33.7
7-
github.com/containers/image/v5 v5.29.2
8-
github.com/containers/storage v1.51.0
8+
github.com/containers/buildah v1.35.4
9+
github.com/containers/image/v5 v5.30.1
10+
github.com/containers/storage v1.53.0
911
)
1012

1113
require (
1214
dario.cat/mergo v1.0.0 // indirect
1315
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
1416
github.com/BurntSushi/toml v1.3.2 // indirect
1517
github.com/Microsoft/go-winio v0.6.1 // indirect
16-
github.com/Microsoft/hcsshim v0.12.0-rc.2 // indirect
18+
github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect
1719
github.com/VividCortex/ewma v1.2.0 // indirect
1820
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
1921
github.com/aead/serpent v0.0.0-20160714141033-fba169763ea6 // indirect
2022
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2123
github.com/chzyer/readline v1.5.1 // indirect
22-
github.com/containerd/cgroups/v3 v3.0.3 // indirect
23-
github.com/containerd/containerd v1.7.11 // indirect
24+
github.com/cilium/ebpf v0.9.1 // indirect
25+
github.com/containerd/cgroups/v3 v3.0.2 // indirect
26+
github.com/containerd/containerd v1.7.13 // indirect
27+
github.com/containerd/errdefs v0.1.0 // indirect
2428
github.com/containerd/log v0.1.0 // indirect
2529
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
2630
github.com/containerd/typeurl/v2 v2.1.1 // indirect
2731
github.com/containernetworking/cni v1.1.2 // indirect
2832
github.com/containernetworking/plugins v1.4.0 // indirect
29-
github.com/containers/common v0.57.4 // indirect
33+
github.com/containers/common v0.58.3 // indirect
3034
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
31-
github.com/containers/luksy v0.0.0-20231127213545-c2b9b9dbf004 // indirect
32-
github.com/containers/ocicrypt v1.1.9 // indirect
35+
github.com/containers/luksy v0.0.0-20240212203526-ceb12d4fd50c // indirect
36+
github.com/containers/ocicrypt v1.1.10 // indirect
3337
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3438
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
3539
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
36-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
40+
github.com/davecgh/go-spew v1.1.1 // indirect
3741
github.com/disiqueira/gotree/v3 v3.0.2 // indirect
3842
github.com/distribution/reference v0.5.0 // indirect
3943
github.com/docker/distribution v2.8.3+incompatible // indirect
40-
github.com/docker/docker v24.0.9+incompatible // indirect
41-
github.com/docker/docker-credential-helpers v0.8.0 // indirect
42-
github.com/docker/go-connections v0.4.1-0.20231110212414-fa09c952e3ea // indirect
44+
github.com/docker/docker v25.0.3+incompatible // indirect
45+
github.com/docker/docker-credential-helpers v0.8.1 // indirect
46+
github.com/docker/go-connections v0.5.0 // indirect
4347
github.com/docker/go-units v0.5.0 // indirect
48+
github.com/felixge/httpsnoop v1.0.4 // indirect
4449
github.com/fsnotify/fsnotify v1.7.0 // indirect
4550
github.com/fsouza/go-dockerclient v1.10.1 // indirect
4651
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
47-
github.com/go-openapi/analysis v0.22.1 // indirect
48-
github.com/go-openapi/errors v0.21.0 // indirect
49-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
50-
github.com/go-openapi/jsonreference v0.20.4 // indirect
51-
github.com/go-openapi/loads v0.21.5 // indirect
52-
github.com/go-openapi/runtime v0.26.2 // indirect
53-
github.com/go-openapi/spec v0.20.13 // indirect
54-
github.com/go-openapi/strfmt v0.22.0 // indirect
55-
github.com/go-openapi/swag v0.22.7 // indirect
56-
github.com/go-openapi/validate v0.22.6 // indirect
52+
github.com/go-logr/logr v1.4.1 // indirect
53+
github.com/go-logr/stdr v1.2.2 // indirect
54+
github.com/go-openapi/analysis v0.21.4 // indirect
55+
github.com/go-openapi/errors v0.21.1 // indirect
56+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
57+
github.com/go-openapi/jsonreference v0.20.2 // indirect
58+
github.com/go-openapi/loads v0.21.2 // indirect
59+
github.com/go-openapi/runtime v0.26.0 // indirect
60+
github.com/go-openapi/spec v0.20.9 // indirect
61+
github.com/go-openapi/strfmt v0.22.2 // indirect
62+
github.com/go-openapi/swag v0.22.10 // indirect
63+
github.com/go-openapi/validate v0.22.1 // indirect
5764
github.com/godbus/dbus/v5 v5.1.0 // indirect
5865
github.com/gogo/protobuf v1.3.2 // indirect
5966
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6067
github.com/golang/protobuf v1.5.3 // indirect
61-
github.com/google/go-containerregistry v0.17.0 // indirect
68+
github.com/google/go-containerregistry v0.19.0 // indirect
6269
github.com/google/go-intervals v0.0.2 // indirect
63-
github.com/google/uuid v1.5.0 // indirect
70+
github.com/google/uuid v1.6.0 // indirect
6471
github.com/gorilla/mux v1.8.1 // indirect
6572
github.com/hashicorp/errwrap v1.1.0 // indirect
6673
github.com/hashicorp/go-multierror v1.1.1 // indirect
6774
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6875
github.com/jinzhu/copier v0.4.0 // indirect
6976
github.com/josharian/intern v1.0.0 // indirect
7077
github.com/json-iterator/go v1.1.12 // indirect
71-
github.com/klauspost/compress v1.17.4 // indirect
78+
github.com/klauspost/compress v1.17.7 // indirect
7279
github.com/klauspost/pgzip v1.2.6 // indirect
73-
github.com/letsencrypt/boulder v0.0.0-20240104140712-c1f7de06e9f8 // indirect
80+
github.com/letsencrypt/boulder v0.0.0-20230907030200-6d76a0f91e1e // indirect
7481
github.com/mailru/easyjson v0.7.7 // indirect
7582
github.com/manifoldco/promptui v0.9.0 // indirect
7683
github.com/mattn/go-runewidth v0.0.15 // indirect
7784
github.com/mattn/go-shellwords v1.0.12 // indirect
78-
github.com/mattn/go-sqlite3 v1.14.19 // indirect
85+
github.com/mattn/go-sqlite3 v1.14.22 // indirect
7986
github.com/miekg/pkcs11 v1.1.1 // indirect
8087
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
8188
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -90,12 +97,12 @@ require (
9097
github.com/morikuni/aec v1.0.0 // indirect
9198
github.com/oklog/ulid v1.3.1 // indirect
9299
github.com/opencontainers/go-digest v1.0.0 // indirect
93-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
94-
github.com/opencontainers/runc v1.2.0-rc.1 // indirect
100+
github.com/opencontainers/image-spec v1.1.0 // indirect
101+
github.com/opencontainers/runc v1.1.12 // indirect
95102
github.com/opencontainers/runtime-spec v1.2.0 // indirect
96103
github.com/opencontainers/runtime-tools v0.9.1-0.20230914150019-408c51e934dc // indirect
97104
github.com/opencontainers/selinux v1.11.0 // indirect
98-
github.com/openshift/imagebuilder v1.2.6-0.20231127234745-ef2a5fe47510 // indirect
105+
github.com/openshift/imagebuilder v1.2.6 // indirect
99106
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
100107
github.com/pkg/errors v0.9.1 // indirect
101108
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -104,36 +111,40 @@ require (
104111
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
105112
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
106113
github.com/sigstore/fulcio v1.4.3 // indirect
107-
github.com/sigstore/rekor v1.3.4 // indirect
108-
github.com/sigstore/sigstore v1.8.0 // indirect
114+
github.com/sigstore/rekor v1.2.2 // indirect
115+
github.com/sigstore/sigstore v1.8.2 // indirect
109116
github.com/sirupsen/logrus v1.9.3 // indirect
110117
github.com/spf13/cobra v1.8.0 // indirect
111118
github.com/spf13/pflag v1.0.5 // indirect
112-
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
119+
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
113120
github.com/sylabs/sif/v2 v2.15.1 // indirect
114121
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
115122
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
116123
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
117124
github.com/ulikunitz/xz v0.5.11 // indirect
118125
github.com/vbatts/tar-split v0.11.5 // indirect
119-
github.com/vbauerster/mpb/v8 v8.7.1 // indirect
126+
github.com/vbauerster/mpb/v8 v8.7.2 // indirect
120127
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
121128
github.com/vishvananda/netns v0.0.4 // indirect
122-
go.etcd.io/bbolt v1.3.8 // indirect
123-
go.mongodb.org/mongo-driver v1.13.1 // indirect
129+
go.etcd.io/bbolt v1.3.9 // indirect
130+
go.mongodb.org/mongo-driver v1.14.0 // indirect
124131
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
125132
go.opencensus.io v0.24.0 // indirect
133+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
134+
go.opentelemetry.io/otel v1.22.0 // indirect
135+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
136+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
126137
golang.org/x/crypto v0.21.0 // indirect
127-
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
128-
golang.org/x/mod v0.14.0 // indirect
129-
golang.org/x/net v0.23.0 // indirect
138+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
139+
golang.org/x/mod v0.15.0 // indirect
140+
golang.org/x/net v0.22.0 // indirect
130141
golang.org/x/sync v0.6.0 // indirect
131142
golang.org/x/sys v0.18.0 // indirect
132143
golang.org/x/term v0.18.0 // indirect
133144
golang.org/x/text v0.14.0 // indirect
134-
golang.org/x/tools v0.16.1 // indirect
135-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
136-
google.golang.org/grpc v1.60.1 // indirect
145+
golang.org/x/tools v0.18.0 // indirect
146+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
147+
google.golang.org/grpc v1.61.0 // indirect
137148
google.golang.org/protobuf v1.33.0 // indirect
138149
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
139150
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)