Skip to content

Commit ac180cf

Browse files
rajchrajch
committed
Upgraded dependency
- Details in reweave/CHANGELOG.md
1 parent ff91a56 commit ac180cf

File tree

13 files changed

+135
-125
lines changed

13 files changed

+135
-125
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/containernetworking/cni v1.1.2
1111
github.com/containernetworking/plugins v1.2.0
1212
github.com/coreos/go-iptables v0.6.0
13-
github.com/docker/docker v24.0.7+incompatible
13+
github.com/docker/docker v24.0.9+incompatible
1414
github.com/docker/libnetwork v0.8.0-dev.2.0.20180212220201-119badbd737b
1515
github.com/docker/machine v0.14.0
1616
github.com/fsouza/go-dockerclient v1.10.0

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
8585
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8686
github.com/docker/distribution v2.8.2-beta.1+incompatible h1:gILO60VLD2v28ozemv4aAwDb8ds5U2O/vD/sBXbd7Rw=
8787
github.com/docker/distribution v2.8.2-beta.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
88-
github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
89-
github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
88+
github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0=
89+
github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
9090
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
9191
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
9292
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=

‎reweave/CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22

33
All changes made to the weave net codebase during the reweave effort will be documented in this file.
44

5-
## 2.8.4
5+
## 2.8.5-beta1
6+
7+
### Changed
8+
9+
* Upgraded github.com/docker/docker to 24.0.9+incompatible
10+
* Ran `go mod vendor`
11+
* Modified `reweave/build/Dockerfile`, to cater for timeouts and other errors during `apt` operations
12+
13+
## 2.8.4 (c3afe552)
614

715
### Changed
816

‎reweave/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
IMAGE_VERSION ?= 2.8.4
1+
IMAGE_VERSION ?= 2.8.5-beta1
22
REGISTRY_USER ?= rajchaudhuri
33

44
ALPINE_BASEIMAGE ?= alpine:3.19.1

‎reweave/build/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG ALPINE_BASEIMAGE=alpine:3.19.1
77
# It will be built only once for a given build platform. Subsequent
88
# stages will start from this and cross-compile for each target
99
# architecture.
10-
FROM --platform=${BUILDPLATFORM} golang:1.21.6-bullseye AS builderbase
10+
FROM --platform=${BUILDPLATFORM} golang:1.21.9-bullseye AS builderbase
1111

1212
# Support Raspberry Pi 2 and newer
1313
ENV GOARM 7
@@ -23,8 +23,11 @@ ENV DEB_CROSSPLATFORMS \
2323

2424
# Install the build-essential and crossbuild-essential-ARCH packages
2525
RUN <<EOCROSSCOMPILERS
26+
set -e
27+
echo 'Acquire::Retries "6";' > /etc/apt/apt.conf.d/80-retries
2628
for platform in ${DEB_CROSSPLATFORMS}; do dpkg --add-architecture $platform; done
27-
apt-get update
29+
apt-get update --error-on=any
30+
apt-get upgrade -y
2831
apt-get install -y build-essential
2932
for platform in ${DEB_CROSSPLATFORMS}; do apt-get install -y crossbuild-essential-${platform}; done
3033
apt-get clean

‎reweave/scans/badge.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"schemaVersion": 1, "label": "Vulnerabilty count", "message": "24", "color": "orange"}
1+
{"schemaVersion": 1, "label": "Vulnerabilty count", "message": "17", "color": "orange"}

‎reweave/scans/report.md

Lines changed: 74 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Vulnerability Report
22

33
```
4-
Report date: 2024-03-30
5-
Unique vulnerability count: 24
6-
Images version: 2.8.4
4+
Report date: 2024-04-04
5+
Unique vulnerability count: 17
6+
Images version: 2.8.5-beta1
77
```
88

99
## Scanner Details
@@ -23,116 +23,90 @@ Supported DB Schema: 5
2323

2424
## Vulnerabilities
2525

26-
### weave-kube: (24)
26+
### weave-kube: (17)
2727

2828
```
29-
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
30-
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
31-
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
32-
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
33-
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
34-
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
35-
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
36-
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
37-
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
38-
c-ares 1.24.0-r1 1.27.0-r0 apk CVE-2024-25629 Medium
39-
curl 8.5.0-r0 apk CVE-2024-0853 Medium
40-
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
41-
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
42-
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
43-
github.com/docker/docker v24.0.7+incompatible 24.0.9 go-module GHSA-xw73-rw38-6vjc Medium
44-
libuv 1.47.0-r0 apk CVE-2024-24806 High
45-
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
46-
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
47-
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
48-
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
49-
stdlib go1.21.6 go-module CVE-2024-24785 Unknown
50-
stdlib go1.21.6 go-module CVE-2024-24784 Unknown
51-
stdlib go1.21.6 go-module CVE-2024-24783 Unknown
52-
stdlib go1.21.6 go-module CVE-2023-45290 Unknown
53-
stdlib go1.21.6 go-module CVE-2023-45289 Unknown
29+
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
30+
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
31+
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
32+
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
33+
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
34+
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
35+
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
36+
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
37+
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
38+
curl 8.5.0-r0 apk CVE-2024-0853 Medium
39+
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
40+
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
41+
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
42+
libuv 1.47.0-r0 apk CVE-2024-24806 High
43+
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
44+
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
45+
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
46+
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
5447
```
5548

56-
### weave-npc: (17)
49+
### weave-npc: (12)
5750

5851
```
59-
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
60-
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
61-
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
62-
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
63-
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
64-
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
65-
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
66-
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
67-
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
68-
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
69-
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
70-
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
71-
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
72-
stdlib go1.21.6 go-module CVE-2024-24785 Unknown
73-
stdlib go1.21.6 go-module CVE-2024-24784 Unknown
74-
stdlib go1.21.6 go-module CVE-2024-24783 Unknown
75-
stdlib go1.21.6 go-module CVE-2023-45290 Unknown
76-
stdlib go1.21.6 go-module CVE-2023-45289 Unknown
52+
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
53+
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
54+
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
55+
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
56+
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
57+
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
58+
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
59+
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
60+
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
61+
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
62+
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
63+
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
64+
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
7765
```
7866

79-
### weave: (24)
67+
### weave: (17)
8068

8169
```
82-
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
83-
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
84-
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
85-
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
86-
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
87-
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
88-
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
89-
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
90-
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
91-
c-ares 1.24.0-r1 1.27.0-r0 apk CVE-2024-25629 Medium
92-
curl 8.5.0-r0 apk CVE-2024-0853 Medium
93-
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
94-
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
95-
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
96-
github.com/docker/docker v24.0.7+incompatible 24.0.9 go-module GHSA-xw73-rw38-6vjc Medium
97-
libuv 1.47.0-r0 apk CVE-2024-24806 High
98-
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
99-
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
100-
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
101-
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
102-
stdlib go1.21.6 go-module CVE-2024-24785 Unknown
103-
stdlib go1.21.6 go-module CVE-2024-24784 Unknown
104-
stdlib go1.21.6 go-module CVE-2024-24783 Unknown
105-
stdlib go1.21.6 go-module CVE-2023-45290 Unknown
106-
stdlib go1.21.6 go-module CVE-2023-45289 Unknown
70+
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
71+
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
72+
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
73+
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
74+
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
75+
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
76+
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
77+
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
78+
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
79+
curl 8.5.0-r0 apk CVE-2024-0853 Medium
80+
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
81+
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
82+
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
83+
libuv 1.47.0-r0 apk CVE-2024-24806 High
84+
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
85+
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
86+
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
87+
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
10788
```
10889

109-
### weaveexec: (24)
90+
### weaveexec: (17)
11091

11192
```
112-
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
113-
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
114-
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
115-
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
116-
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
117-
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
118-
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
119-
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
120-
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
121-
c-ares 1.24.0-r1 1.27.0-r0 apk CVE-2024-25629 Medium
122-
curl 8.5.0-r0 apk CVE-2024-0853 Medium
123-
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
124-
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
125-
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
126-
github.com/docker/docker v24.0.7+incompatible 24.0.9 go-module GHSA-xw73-rw38-6vjc Medium
127-
libuv 1.47.0-r0 apk CVE-2024-24806 High
128-
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
129-
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
130-
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
131-
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
132-
stdlib go1.21.6 go-module CVE-2024-24785 Unknown
133-
stdlib go1.21.6 go-module CVE-2024-24784 Unknown
134-
stdlib go1.21.6 go-module CVE-2024-24783 Unknown
135-
stdlib go1.21.6 go-module CVE-2023-45290 Unknown
136-
stdlib go1.21.6 go-module CVE-2023-45289 Unknown
93+
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
94+
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
95+
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
96+
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
97+
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
98+
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
99+
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
100+
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
101+
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
102+
curl 8.5.0-r0 apk CVE-2024-0853 Medium
103+
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
104+
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
105+
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
106+
libuv 1.47.0-r0 apk CVE-2024-24806 High
107+
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
108+
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
109+
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
110+
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
137111
```
138112

‎vendor/github.com/docker/docker/api/swagger.yaml

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/docker/client/container_wait.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go

Lines changed: 4 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)