Skip to content

Commit de566bf

Browse files
authored
chore: upgrade lib versions for quay security scanner (#1704)
* upgrade lib versions for quay security scanner * update image version * upgrade go to latest stable 1.26.3
1 parent 38eca18 commit de566bf

4 files changed

Lines changed: 18 additions & 18 deletions

File tree

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module localhost
22

3-
go 1.21
3+
go 1.26.3
44

55
require (
66
github.com/Jigsaw-Code/outline-ss-server v1.7.3
@@ -37,10 +37,10 @@ require (
3737
github.com/shadowsocks/go-shadowsocks2 v0.1.5 // indirect
3838
github.com/spf13/pflag v1.0.5 // indirect
3939
github.com/zeebo/xxh3 v1.0.2 // indirect
40-
golang.org/x/crypto v0.31.0 // indirect
40+
golang.org/x/crypto v0.45.0 // indirect
4141
golang.org/x/sync v0.7.0 // indirect
42-
golang.org/x/sys v0.28.0 // indirect
43-
golang.org/x/term v0.27.0 // indirect
42+
golang.org/x/sys v0.38.0 // indirect
43+
golang.org/x/term v0.37.0 // indirect
4444
google.golang.org/protobuf v1.30.0 // indirect
4545
gopkg.in/yaml.v3 v3.0.1 // indirect
4646
mvdan.cc/sh/v3 v3.8.0 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
9191
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
9292
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
9393
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
94-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
95-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
94+
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
95+
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
9696
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
9797
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9898
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -102,11 +102,11 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
102102
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
103103
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
104104
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
105-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
106-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
105+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
106+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
107107
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
108-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
109-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
108+
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
109+
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
110110
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
111111
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
112112
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=

src/shadowbox/Taskfile.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,14 @@ tasks:
7676
IMAGE_NAME: '{{.IMAGE_NAME | default "localhost/outline/shadowbox"}}'
7777
TARGET_ARCH: '{{.TARGET_ARCH | default "x86_64"}}'
7878
IMAGE_ROOT: '{{joinPath .OUTPUT_BASE "image_root" .TARGET_ARCH}}'
79-
# Newer node images have no valid content trust data.
80-
# Pin the image node:16.18.0-alpine3.16 by hash.
81-
# See image at https://hub.docker.com/_/node/tags?page=1&name=18.18.0-alpine3.18
79+
# Pin the image node:18.20.8-alpine3.21 by hash.
80+
# See image at https://hub.docker.com/_/node/tags?page=1&name=18.20.8-alpine3.21
8281
# Note: "aarch64" is an alias for "arm64" — Linux ARM64 hosts report "aarch64" via uname -m.
8382
NODE_IMAGE: '{{get
8483
(dict
85-
"x86_64" "node@sha256:a0b787b0d53feacfa6d606fb555e0dbfebab30573277f1fe25148b05b66fa097"
86-
"arm64" "node@sha256:b4b7a1dd149c65ee6025956ac065a843b4409a62068bd2b0cbafbb30ca2fab3b"
87-
"aarch64" "node@sha256:b4b7a1dd149c65ee6025956ac065a843b4409a62068bd2b0cbafbb30ca2fab3b"
84+
"x86_64" "node@sha256:929b04d7c782f04f615cf785488fed452b6569f87c73ff666ad553a7554f0006"
85+
"arm64" "node@sha256:c2281c62c4aadf92ea71a6c05e6c8e640634b6a99dc52a6e54575f9cb298a037"
86+
"aarch64" "node@sha256:c2281c62c4aadf92ea71a6c05e6c8e640634b6a99dc52a6e54575f9cb298a037"
8887
) .TARGET_ARCH
8988
}}'
9089
DOCKER_PLATFORM: '{{get

src/shadowbox/docker/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ FROM ${NODE_IMAGE}
1818
ARG VERSION
1919

2020
# Save metadata on the software versions we are using.
21-
LABEL shadowbox.node_version=16.18.0
21+
LABEL shadowbox.node_version=18.20.8
2222

2323
LABEL shadowbox.github.release=${VERSION}
2424

2525
# The user management service doesn't quit with SIGTERM.
2626
STOPSIGNAL SIGKILL
2727

28+
# Upgrade installed Alpine packages to pick up security fixes (musl-utils, busybox, ssl_client, etc.).
2829
# We use curl to detect the server's public IP. We need to use the --date option in `date` to
2930
# safely grab the ip-to-country database.
30-
RUN apk add --no-cache --upgrade coreutils curl
31+
RUN apk upgrade --no-cache && apk add --no-cache --upgrade coreutils curl
3132

3233
COPY . /
3334

0 commit comments

Comments
 (0)