Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade backend dependencies and base images #293

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Upgrade backend dependencies and base images #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ edition = "2021"
rust-version = "1.82"

[workspace.dependencies]
anyhow = "1.0.93"
anyhow = "1.0.94"
as-any = "0.3.1"
askama = "0.12.1"
async-trait = "0.1.83"
axum = { version = "0.7.9", features = ["macros"] }
base64 = "0.22.1"
cached = { version = "0.54.0", features = ["async"] }
clap = { version = "4.5.21", features = ["derive"] }
clap = { version = "4.5.23", features = ["derive"] }
clowarden-core = { path = "../clowarden-core" }
deadpool-postgres = { version = "0.14.0", features = ["serde"] }
figment = { version = "0.10.19", features = ["yaml", "env"] }
Expand All @@ -40,14 +40,14 @@ serde_json = "1.0.133"
serde_qs = "0.13.0"
serde_yaml = "0.9.34"
sha2 = "0.10.8"
thiserror = "2.0.3"
time = { version = "0.3.36", features = [
thiserror = "2.0.6"
time = { version = "0.3.37", features = [
"formatting",
"macros",
"parsing",
"serde",
] }
tokio = { version = "1.41.1", features = [
tokio = { version = "1.42.0", features = [
"macros",
"process",
"rt-multi-thread",
Expand All @@ -60,9 +60,9 @@ tokio-postgres = { version = "0.7.12", features = [
"with-serde_json-1",
"with-time-0_3",
] }
tokio-util = { version = "0.7.12", features = ["rt"] }
tokio-util = { version = "0.7.13", features = ["rt"] }
tower = "0.5.1"
tower-http = { version = "0.6.2", features = ["auth", "fs", "set-header", "trace"] }
tracing = "0.1.41"
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] }
uuid = { version = "1.11.0", features = ["serde", "v4"] }
6 changes: 3 additions & 3 deletions clowarden-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build clowarden
FROM rust:1-alpine3.20 AS builder
FROM rust:1-alpine3.21 AS builder
RUN apk --no-cache add musl-dev perl make
WORKDIR /clowarden
COPY Cargo.* ./
Expand All @@ -10,7 +10,7 @@ WORKDIR /clowarden/clowarden-server
RUN cargo build --release

# Build frontend
FROM node:18-alpine3.20 AS frontend-builder
FROM node:18-alpine3.21 AS frontend-builder
RUN apk --no-cache add git
WORKDIR /web
COPY web .
Expand All @@ -20,7 +20,7 @@ RUN yarn install --network-concurrency 1
RUN yarn build

# Final stage
FROM alpine:3.20.3
FROM alpine:3.21.0
RUN apk --no-cache add ca-certificates && addgroup -S clowarden && adduser -S clowarden -G clowarden
USER clowarden
WORKDIR /home/clowarden
Expand Down
4 changes: 2 additions & 2 deletions database/migrations/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Build tern
FROM golang:1.23.3-alpine3.20 AS tern
FROM golang:1.23.4-alpine3.21 AS tern
RUN apk --no-cache add git
RUN go install github.com/jackc/tern@latest

# Build final image
FROM alpine:3.20.3
FROM alpine:3.21.0
RUN addgroup -S clowarden && adduser -S clowarden -G clowarden
USER clowarden
WORKDIR /home/clowarden
Expand Down
Loading