Skip to content

Commit

Permalink
Upgrade backend dependencies and base images (#220)
Browse files Browse the repository at this point in the history
Signed-off-by: Sergio Castaño Arteaga <[email protected]>
  • Loading branch information
tegioz authored Jun 25, 2024
1 parent c966d3b commit 574e03b
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 48 deletions.
65 changes: 33 additions & 32 deletions Cargo.lock

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

22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,41 @@ edition = "2021"
rust-version = "1.70"

[workspace.dependencies]
anyhow = "1.0.83"
anyhow = "1.0.86"
as-any = "0.3.1"
askama = "0.12.1"
async-trait = "0.1.80"
axum = { version = "0.7.5", features = ["macros"] }
base64 = "0.22.1"
cached = { version = "0.51.3", features = ["async"] }
clap = { version = "4.5.4", features = ["derive"] }
cached = { version = "0.51.4", features = ["async"] }
clap = { version = "4.5.7", features = ["derive"] }
clowarden-core = { path = "../clowarden-core" }
config = "0.13.4"
deadpool-postgres = { version = "0.13.2", features = ["serde"] }
deadpool-postgres = { version = "0.14.0", features = ["serde"] }
futures = "0.3.30"
hmac = "0.12.1"
hex = "0.4.3"
lazy_static = "1.4.0"
lazy_static = "1.5.0"
mime = "0.3.17"
mockall = "0.12.1"
octorust = { git = "https://github.com/tegioz/third-party-api-clients.git" }
openssl = { version = "0.10.64", features = ["vendored"] }
pem = "3.0.4"
postgres-openssl = "0.5.0"
regex = "1.10.4"
serde = { version = "1.0.201", features = ["derive"] }
serde_json = "1.0.117"
regex = "1.10.5"
serde = { version = "1.0.203", features = ["derive"] }
serde_json = "1.0.118"
serde_qs = "0.13.0"
serde_yaml = "0.9.34"
sha2 = "0.10.8"
thiserror = "1.0.57"
thiserror = "1.0.61"
time = { version = "0.3.36", features = [
"formatting",
"macros",
"parsing",
"serde",
] }
tokio = { version = "1.37.0", features = [
tokio = { version = "1.38.0", features = [
"macros",
"process",
"rt-multi-thread",
Expand All @@ -64,4 +64,4 @@ tower = "0.4.13"
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"] }
uuid = { version = "1.8.0", features = ["serde", "v4"] }
uuid = { version = "1.9.1", features = ["serde", "v4"] }
6 changes: 3 additions & 3 deletions clowarden-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build clowarden
FROM rust:1-alpine3.19 as builder
FROM rust:1-alpine3.20 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.19 AS frontend-builder
FROM node:18-alpine3.20 AS frontend-builder
RUN apk --no-cache add git
WORKDIR /web
COPY web .
Expand All @@ -19,7 +19,7 @@ RUN yarn install --network-concurrency 1
RUN yarn build

# Final stage
FROM alpine:3.19.1
FROM alpine:3.20.1
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.3-alpine3.19 AS tern
FROM golang:1.22.4-alpine3.19 AS tern
RUN apk --no-cache add git
RUN go install github.com/jackc/tern@latest

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

0 comments on commit 574e03b

Please sign in to comment.