Skip to content

Commit

Permalink
Upgrade base images and backend dependencies (#1365)
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 Dec 21, 2023
1 parent 398b47b commit 1de98cf
Show file tree
Hide file tree
Showing 9 changed files with 217 additions and 256 deletions.
423 changes: 192 additions & 231 deletions Cargo.lock

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,44 +17,44 @@ edition = "2021"
rust-version = "1.65"

[workspace.dependencies]
anyhow = "1.0.75"
anyhow = "1.0.76"
askalono = "0.4.6"
askama = "0.12.1"
askama_axum = "0.3.0"
async-trait = "0.1.74"
async-trait = "0.1.75"
axum = { version = "0.6.20", features = ["macros"] }
bincode = "1.3.3"
cached = { version = "0.46.1", features = ["async"] }
clap = { version = "4.4.5", features = ["derive"] }
clomonitor-core = { path = "../clomonitor-core" }
comfy-table = "7.1.0"
config = "0.13.3"
config = "0.13.4"
deadpool = "0.10.0"
deadpool-postgres = { version = "0.11.0", features = ["serde"] }
deadpool-postgres = { version = "0.12.1", features = ["serde"] }
futures = "0.3.29"
git2 = "0.18.1"
glob = "0.3.1"
graphql_client = { version = "0.13.0", features = ["reqwest"] }
hex = "0.4.3"
http = "0.2.11"
hyper = "0.14.27"
hyper = "0.14.28"
lazy_static = "1.4.0"
metrics = "0.21.1"
metrics-exporter-prometheus = "0.12.1"
metrics-exporter-prometheus = "0.12.2"
mime = "0.3.17"
mockall = "0.11.4"
mockall = "0.12.0"
mockito = "1.1.1"
octorust = "0.3.2"
openssl = { version = "0.10.59", features = ["vendored"] }
openssl = { version = "0.10.61", features = ["vendored"] }
postgres-openssl = "0.5.0"
postgres-types = { version = "0.2.6", features = ["derive"] }
predicates = "3.0.4"
regex = "1.10.2"
reqwest = "0.11.22"
reqwest = "0.11.23"
resvg = "0.27.0"
serde = { version = "1.0.192", features = ["derive"] }
serde = { version = "1.0.193", features = ["derive"] }
serde_json = "1.0.108"
serde_yaml = "0.9.27"
serde_yaml = "0.9.28"
serde_qs = "0.12.0"
sha2 = "0.10.8"
tempfile = "3.8.1"
Expand All @@ -66,7 +66,7 @@ time = { version = "0.3.29", features = [
"serde",
] }
tiny-skia = "0.8.4"
tokio = { version = "1.34.0", features = [
tokio = { version = "1.35.1", features = [
"macros",
"process",
"rt-multi-thread",
Expand All @@ -86,8 +86,8 @@ tower-http = { version = "0.4.4", features = [
"trace",
] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json"] }
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
usvg = "0.27.0"
uuid = { version = "1.5.0", features = ["serde"] }
uuid = { version = "1.6.1", features = ["serde"] }
which = "5.0.0"
wiremock = "0.5.21"
wiremock = "0.5.22"
2 changes: 1 addition & 1 deletion clomonitor-apiserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ WORKDIR /docs/www
RUN hugo

# Final stage
FROM alpine:3.18.4
FROM alpine:3.18.5
RUN apk --no-cache add ca-certificates ttf-opensans && addgroup -S clomonitor && adduser -S clomonitor -G clomonitor
USER clomonitor
WORKDIR /home/clomonitor
Expand Down
2 changes: 1 addition & 1 deletion clomonitor-archiver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-archiver
RUN cargo build --release

# Final stage
FROM alpine:3.18.4
FROM alpine:3.18.5
RUN apk --no-cache add ca-certificates git && addgroup -S clomonitor && adduser -S clomonitor -G clomonitor
USER clomonitor
WORKDIR /home/clomonitor
Expand Down
4 changes: 2 additions & 2 deletions clomonitor-linter/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-linter
RUN cargo build --release

# Build OpenSSF scorecard
FROM golang:1.21.4-alpine3.18 AS scorecard
FROM golang:1.21.5-alpine3.18 AS scorecard
WORKDIR /tmp
RUN apk --no-cache add git make bash gcc musl-dev binutils-gold
RUN git clone https://github.com/ossf/scorecard
Expand All @@ -24,7 +24,7 @@ RUN make install
RUN make build

# Final stage
FROM alpine:3.18.4
FROM alpine:3.18.5
RUN addgroup -S clomonitor && adduser -S clomonitor -G clomonitor
USER clomonitor
WORKDIR /home/clomonitor
Expand Down
2 changes: 1 addition & 1 deletion clomonitor-notifier/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-notifier
RUN cargo build --release

# Final stage
FROM alpine:3.18.4
FROM alpine:3.18.5
RUN apk --no-cache add ca-certificates git && addgroup -S clomonitor && adduser -S clomonitor -G clomonitor
USER clomonitor
WORKDIR /home/clomonitor
Expand Down
2 changes: 1 addition & 1 deletion clomonitor-registrar/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-registrar
RUN cargo build --release

# Final stage
FROM alpine:3.18.4
FROM alpine:3.18.5
RUN apk --no-cache add ca-certificates git && addgroup -S clomonitor && adduser -S clomonitor -G clomonitor
USER clomonitor
WORKDIR /home/clomonitor
Expand Down
4 changes: 2 additions & 2 deletions clomonitor-tracker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ WORKDIR /clomonitor/clomonitor-tracker
RUN cargo build --release

# Build OpenSSF scorecard
FROM golang:1.21.4-alpine3.18 AS scorecard
FROM golang:1.21.5-alpine3.18 AS scorecard
WORKDIR /tmp
RUN apk --no-cache add git make bash gcc musl-dev binutils-gold
RUN git clone https://github.com/ossf/scorecard
Expand All @@ -24,7 +24,7 @@ RUN make install
RUN make build

# Final stage
FROM alpine:3.18.4
FROM alpine:3.18.5
RUN apk --no-cache add ca-certificates git && addgroup -S clomonitor && adduser -S clomonitor -G clomonitor
USER clomonitor
WORKDIR /home/clomonitor
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.21.4-alpine3.18 AS tern
FROM golang:1.21.5-alpine3.19 AS tern
RUN apk --no-cache add git
RUN go install github.com/jackc/tern@latest

# Build final image
FROM alpine:3.18.4
FROM alpine:3.19.0
RUN addgroup -S clomonitor && adduser -S clomonitor -G clomonitor
USER clomonitor
WORKDIR /home/clomonitor
Expand Down

0 comments on commit 1de98cf

Please sign in to comment.