diff --git a/dockerfiles/cd/builders/skaffold-centos7.yaml b/dockerfiles/cd/builders/skaffold-centos7.yaml index 5e6eaeb9..708ad6df 100644 --- a/dockerfiles/cd/builders/skaffold-centos7.yaml +++ b/dockerfiles/cd/builders/skaffold-centos7.yaml @@ -74,7 +74,7 @@ profiles: path: /build/artifacts/0/docker/buildArgs value: &value-go1-22 # renovate: datasource=docker depName=golang - GOLANG_VERSION: 1.22.9 + GOLANG_VERSION: 1.22.10 - op: add path: /build/artifacts/1/docker/buildArgs value: *value-go1-22 diff --git a/dockerfiles/cd/builders/skaffold.yaml b/dockerfiles/cd/builders/skaffold.yaml index a22146fd..d33f3c1b 100644 --- a/dockerfiles/cd/builders/skaffold.yaml +++ b/dockerfiles/cd/builders/skaffold.yaml @@ -91,7 +91,7 @@ profiles: path: /build/artifacts/0/docker/buildArgs value: &value-go1-22 # renovate: datasource=docker depName=golang - GOLANG_VERSION: 1.22.9 + GOLANG_VERSION: 1.22.10 - op: add path: /build/artifacts/1/docker/buildArgs value: *value-go1-22 diff --git a/dockerfiles/ci/jenkins/tikv/Dockerfile b/dockerfiles/ci/jenkins/tikv/Dockerfile index 72918cf9..a5a0d9d9 100644 --- a/dockerfiles/ci/jenkins/tikv/Dockerfile +++ b/dockerfiles/ci/jenkins/tikv/Dockerfile @@ -33,13 +33,12 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --de ENV PATH="${CARGO_HOME}/bin:${PATH}" # install components -RUN rustup component add rustfmt clippy rust-src llvm-tools - -RUN rustup set profile minimal +RUN rustup component add rustfmt clippy rust-src llvm-tools && \ + rustup set profile minimal # Install specific versions of cargo-nextest and cargo-sort RUN rustup update stable && rustup default stable && \ - cargo install cargo-nextest --version 0.9.72 && \ - cargo install cargo-sort --version 1.0.9 + cargo install --locked --version 0.9.72 cargo-nextest && \ + cargo install --locked --version 1.0.9 cargo-sort ENV CARGO_INCREMENTAL=0 diff --git a/dockerfiles/ci/skaffold.yaml b/dockerfiles/ci/skaffold.yaml index fcfca32d..ee4f95b4 100644 --- a/dockerfiles/ci/skaffold.yaml +++ b/dockerfiles/ci/skaffold.yaml @@ -52,7 +52,7 @@ profiles: path: /build/artifacts/0/docker/buildArgs value: &value-go1-22 # renovate: datasource=docker depName=golang - GOLANG_VERSION: 1.22.9 + GOLANG_VERSION: 1.22.10 - op: add path: /build/artifacts/1/docker/buildArgs value: *value-go1-22