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.

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 #256

Merged
merged 1 commit into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup Rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.76.0
toolchain: 1.81.0
components: clippy, rustfmt
- name: Run clippy
run: cargo clippy --all-targets --all-features -- --deny warnings
Expand All @@ -30,7 +30,7 @@ jobs:
- name: Setup Rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.75.0
toolchain: 1.81.0
- name: Run backend tests
run: cargo test

Expand Down
67 changes: 39 additions & 28 deletions Cargo.lock

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

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ members = [
version = "0.1.3"
license = "Apache-2.0"
edition = "2021"
rust-version = "1.70"
rust-version = "1.81"

[workspace.dependencies]
anyhow = "1.0.86"
anyhow = "1.0.88"
as-any = "0.3.1"
askama = "0.12.1"
async-trait = "0.1.81"
async-trait = "0.1.82"
axum = { version = "0.7.5", features = ["macros"] }
base64 = "0.22.1"
cached = { version = "0.53.1", features = ["async"] }
clap = { version = "4.5.11", features = ["derive"] }
clap = { version = "4.5.17", features = ["derive"] }
clowarden-core = { path = "../clowarden-core" }
config = "0.13.4"
deadpool-postgres = { version = "0.14.0", features = ["serde"] }
Expand All @@ -34,9 +34,9 @@ octorust = { git = "https://github.com/tegioz/third-party-api-clients.git" }
openssl = { version = "0.10.66", features = ["vendored"] }
pem = "3.0.4"
postgres-openssl = "0.5.0"
regex = "1.10.5"
serde = { version = "1.0.204", features = ["derive"] }
serde_json = "1.0.120"
regex = "1.10.6"
serde = { version = "1.0.210", features = ["derive"] }
serde_json = "1.0.128"
serde_qs = "0.13.0"
serde_yaml = "0.9.34"
sha2 = "0.10.8"
Expand All @@ -47,7 +47,7 @@ time = { version = "0.3.36", features = [
"parsing",
"serde",
] }
tokio = { version = "1.39.1", features = [
tokio = { version = "1.40.0", features = [
"macros",
"process",
"rt-multi-thread",
Expand All @@ -60,7 +60,7 @@ tokio-postgres = { version = "0.7.11", features = [
"with-serde_json-1",
"with-time-0_3",
] }
tower = "0.4.13"
tower = "0.5.1"
tower-http = { version = "0.5.2", features = ["auth", "fs", "set-header", "trace"] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
Expand Down
2 changes: 1 addition & 1 deletion clowarden-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN yarn install --network-concurrency 1
RUN yarn build

# Final stage
FROM alpine:3.20.2
FROM alpine:3.20.3
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Build tern
FROM golang:1.22.5-alpine3.20 AS tern
FROM golang:1.23.1-alpine3.20 AS tern
RUN apk --no-cache add git
RUN go install github.com/jackc/tern@latest

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