Skip to content

Commit b4d77e5

Browse files
committed
Fix cargo deny and update Rust & Alpine Docker images
1 parent fde5f9a commit b4d77e5

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

Cargo.lock

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

deny.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ targets = [
3434
version = 2
3535

3636
[bans]
37-
multiple-versions = "warn" # only warn since `tonic` doesn't support Axum 0.7 / Hyper 1
3837
wildcards = "deny"
3938

4039
[sources]
@@ -54,6 +53,7 @@ allow = [
5453
"BSD-2-Clause", # since [email protected].*, they included `rav1e`, which includes `v_frame`.
5554
"BSD-3-Clause",
5655
"ISC",
56+
"Unicode-3.0"
5757
]
5858
exceptions = [
5959
# unicode-ident includes data generated from Unicode Character Database
@@ -66,6 +66,9 @@ exceptions = [
6666
"OpenSSL",
6767
] },
6868

69+
{ name = "aws-lc-sys", allow = ["OpenSSL"] },
70+
{ name = "tiny-keccak", allow = ["CC0-1.0"] },
71+
6972
# Allow `error-code` to pass through since arboard uses `clipboard-win`,
7073
# so we will slide it. BSL is Boost Software License, not the other BSL (Business License Source).
7174
{ name = "error-code", allow = [

distribution/docker/alpine.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
############ BINARY
1717

18-
FROM --platform=${TARGETPLATFORM} rust:1.82-alpine3.19 AS build
18+
FROM --platform=${TARGETPLATFORM} rust:1.84.1-alpine3.21 AS build
1919

2020
RUN apk update && apk add --no-cache git ca-certificates curl musl-dev \
2121
libc6-compat gcompat pkgconfig libressl-dev build-base mold \
@@ -46,7 +46,7 @@ RUN cargo build --release --bin ume
4646

4747
############ FINAL STAGE
4848

49-
FROM alpine:3.20
49+
FROM alpine:3.21
5050

5151
RUN apk update && apk add --no-cache bash tini curl libgcc
5252
WORKDIR /app/noel/ume

0 commit comments

Comments
 (0)