From da6e05cc67c4457e7690462545650c9a4e5b6897 Mon Sep 17 00:00:00 2001 From: Guillaume Deconinck Date: Fri, 31 Oct 2025 09:35:01 +0900 Subject: [PATCH 1/2] feat: update Rust and alpine --- .github/workflows/js-client-test.yml | 2 +- .github/workflows/server-test.yml | 2 +- alpine.Dockerfile | 4 ++-- alpineWithDD.Dockerfile | 4 ++-- debian.Dockerfile | 2 +- debianWithDD.Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/js-client-test.yml b/.github/workflows/js-client-test.yml index 568f48a1..c1b5fdc6 100644 --- a/.github/workflows/js-client-test.yml +++ b/.github/workflows/js-client-test.yml @@ -1,7 +1,7 @@ name: JavaScript client tests env: - RUST_VERSION: 1.90.0 + RUST_VERSION: 1.90.1 RUST_BACKTRACE: 1 on: diff --git a/.github/workflows/server-test.yml b/.github/workflows/server-test.yml index 651e51e3..7383a89b 100644 --- a/.github/workflows/server-test.yml +++ b/.github/workflows/server-test.yml @@ -1,7 +1,7 @@ name: Server test env: - RUST_VERSION: 1.90.0 + RUST_VERSION: 1.90.1 on: pull_request: diff --git a/alpine.Dockerfile b/alpine.Dockerfile index 3c01e8dc..06dd60db 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -7,7 +7,7 @@ FROM messense/rust-musl-cross:${ARCH}-musl AS builder ARG ARCH=x86_64 ARG APP_NAME=nittei -ARG RUST_VERSION=1.90.0 +ARG RUST_VERSION=1.90.1 # Install and set the specific Rust version RUN rustup install ${RUST_VERSION} && rustup default ${RUST_VERSION} @@ -33,7 +33,7 @@ RUN cargo build --release --bin nittei-migrate --target ${ARCH}-unknown-linux-mu cp ./target/${ARCH}-unknown-linux-musl/release/nittei-migrate /nittei-migrate #Create a new stage with a minimal image -FROM alpine:3.22.0 +FROM alpine:3.22.2 # Set the git repository url and commit hash for DD ARG GIT_REPO_URL diff --git a/alpineWithDD.Dockerfile b/alpineWithDD.Dockerfile index 44150c3e..e5216a86 100644 --- a/alpineWithDD.Dockerfile +++ b/alpineWithDD.Dockerfile @@ -9,7 +9,7 @@ FROM messense/rust-musl-cross:${ARCH}-musl AS builder ARG ARCH=x86_64 ARG APP_NAME=nittei -ARG RUST_VERSION=1.90.0 +ARG RUST_VERSION=1.90.1 # Install and set the specific Rust version RUN rustup install ${RUST_VERSION} && rustup default ${RUST_VERSION} @@ -45,7 +45,7 @@ RUN ARCH_IN_URL=$(case "${ARCH}" in \ mv ddprof/bin/ddprof /ddprof #Create a new stage with a minimal image -FROM alpine:3.22.0 +FROM alpine:3.22.2 # Set the git repository url and commit hash for DD ARG GIT_REPO_URL diff --git a/debian.Dockerfile b/debian.Dockerfile index 62ba78a3..39c2d5b1 100644 --- a/debian.Dockerfile +++ b/debian.Dockerfile @@ -2,7 +2,7 @@ # docker buildx build -f debian.Dockerfile -t image:tag --build-arg='ARCH=x86_64' --platform linux/amd64 . # docker buildx build -f debian.Dockerfile -t image:tag --build-arg='ARCH=aarch64' --platform linux/arm64 . -FROM rust:1.90.0-slim AS builder +FROM rust:1.90.1-slim AS builder WORKDIR /app/nittei diff --git a/debianWithDD.Dockerfile b/debianWithDD.Dockerfile index 293234c8..409d6fba 100644 --- a/debianWithDD.Dockerfile +++ b/debianWithDD.Dockerfile @@ -4,7 +4,7 @@ # docker buildx build -f debianWithDD.Dockerfile -t image:tag --build-arg='ARCH=x86_64' --platform linux/amd64 . # docker buildx build -f debianWithDD.Dockerfile -t image:tag --build-arg='ARCH=aarch64' --platform linux/arm64 . -FROM rust:1.90.0-slim AS builder +FROM rust:1.90.1-slim AS builder WORKDIR /app/nittei From 539c3bb0c755ceb762300efc41035f3c98988fd7 Mon Sep 17 00:00:00 2001 From: Guillaume Deconinck Date: Fri, 31 Oct 2025 09:37:28 +0900 Subject: [PATCH 2/2] fix: Rust version to 1.91.0 --- .github/workflows/js-client-test.yml | 2 +- .github/workflows/server-test.yml | 2 +- alpine.Dockerfile | 2 +- alpineWithDD.Dockerfile | 2 +- debian.Dockerfile | 2 +- debianWithDD.Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/js-client-test.yml b/.github/workflows/js-client-test.yml index c1b5fdc6..9597eb9f 100644 --- a/.github/workflows/js-client-test.yml +++ b/.github/workflows/js-client-test.yml @@ -1,7 +1,7 @@ name: JavaScript client tests env: - RUST_VERSION: 1.90.1 + RUST_VERSION: 1.91.0 RUST_BACKTRACE: 1 on: diff --git a/.github/workflows/server-test.yml b/.github/workflows/server-test.yml index 7383a89b..eb6d2baf 100644 --- a/.github/workflows/server-test.yml +++ b/.github/workflows/server-test.yml @@ -1,7 +1,7 @@ name: Server test env: - RUST_VERSION: 1.90.1 + RUST_VERSION: 1.91.0 on: pull_request: diff --git a/alpine.Dockerfile b/alpine.Dockerfile index 06dd60db..f44bbe19 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -7,7 +7,7 @@ FROM messense/rust-musl-cross:${ARCH}-musl AS builder ARG ARCH=x86_64 ARG APP_NAME=nittei -ARG RUST_VERSION=1.90.1 +ARG RUST_VERSION=1.91.0 # Install and set the specific Rust version RUN rustup install ${RUST_VERSION} && rustup default ${RUST_VERSION} diff --git a/alpineWithDD.Dockerfile b/alpineWithDD.Dockerfile index e5216a86..86e45c91 100644 --- a/alpineWithDD.Dockerfile +++ b/alpineWithDD.Dockerfile @@ -9,7 +9,7 @@ FROM messense/rust-musl-cross:${ARCH}-musl AS builder ARG ARCH=x86_64 ARG APP_NAME=nittei -ARG RUST_VERSION=1.90.1 +ARG RUST_VERSION=1.91.0 # Install and set the specific Rust version RUN rustup install ${RUST_VERSION} && rustup default ${RUST_VERSION} diff --git a/debian.Dockerfile b/debian.Dockerfile index 39c2d5b1..f4a7199e 100644 --- a/debian.Dockerfile +++ b/debian.Dockerfile @@ -2,7 +2,7 @@ # docker buildx build -f debian.Dockerfile -t image:tag --build-arg='ARCH=x86_64' --platform linux/amd64 . # docker buildx build -f debian.Dockerfile -t image:tag --build-arg='ARCH=aarch64' --platform linux/arm64 . -FROM rust:1.90.1-slim AS builder +FROM rust:1.91.0-slim AS builder WORKDIR /app/nittei diff --git a/debianWithDD.Dockerfile b/debianWithDD.Dockerfile index 409d6fba..b6a67bb7 100644 --- a/debianWithDD.Dockerfile +++ b/debianWithDD.Dockerfile @@ -4,7 +4,7 @@ # docker buildx build -f debianWithDD.Dockerfile -t image:tag --build-arg='ARCH=x86_64' --platform linux/amd64 . # docker buildx build -f debianWithDD.Dockerfile -t image:tag --build-arg='ARCH=aarch64' --platform linux/arm64 . -FROM rust:1.90.1-slim AS builder +FROM rust:1.91.0-slim AS builder WORKDIR /app/nittei