From 8b4bc1d0cb3e9fee18910b190b2fc0980e9bed6f Mon Sep 17 00:00:00 2001 From: core Date: Sat, 6 Apr 2024 23:03:13 -0400 Subject: [PATCH] fix 2 --- .woodpecker/.backplane.yaml | 6 +++--- .woodpecker/.server.yaml | 6 +++--- docker/Dockerfile.build_env | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.woodpecker/.backplane.yaml b/.woodpecker/.backplane.yaml index 129cb504004eee893f12d8229e786deed2b42e1e..13bda27c34432f5bef04f21b227e354bab7ade50 100644 --- a/.woodpecker/.backplane.yaml +++ b/.woodpecker/.backplane.yaml @@ -1,20 +1,20 @@ steps: - name: backplane_fmt - image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040601 + image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040602 commands: - cd starkingdoms-backplane - rustfmt **/*.rs --check --edition 2021 --color always environment: CARGO_INCREMENTAL: "0" - name: backplane_clippy - image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040601 + image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040602 commands: - cd starkingdoms-backplane - cargo clippy --profile release-ci --color always environment: CARGO_INCREMENTAL: "0" - name: backplane_build - image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040601 + image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040602 commands: - cd starkingdoms-backplane - cargo build --profile release-ci --color always diff --git a/.woodpecker/.server.yaml b/.woodpecker/.server.yaml index 687431ea064c4a4815baf79b13e5fc4851010002..80d699038f262df75eb495093c7234f1fcfbc578 100644 --- a/.woodpecker/.server.yaml +++ b/.woodpecker/.server.yaml @@ -1,20 +1,20 @@ steps: - name: server_fmt - image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040601 + image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040602 commands: - cd server - rustfmt **/*.rs --check --edition 2021 --color always environment: CARGO_INCREMENTAL: "0" - name: server_clippy - image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040601 + image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040602 commands: - cd server - cargo clippy --profile release-ci --color always environment: CARGO_INCREMENTAL: "0" - name: server_build - image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040601 + image: registry.gitlab.com/starkingdoms.tk/starkingdoms.tk/build_env:2024040602 commands: - cd server - cargo build --profile release-ci --color always diff --git a/docker/Dockerfile.build_env b/docker/Dockerfile.build_env index b3d08ea8a8b82669b0956866f61ab818a0bb428c..34ff5cdfa3ce0fe97d9674a364c1364b5db89765 100644 --- a/docker/Dockerfile.build_env +++ b/docker/Dockerfile.build_env @@ -1,7 +1,7 @@ -FROM rust:alpine +FROM rust:slim # Note that we add wget here -RUN apk add libpq-dev wget +RUN apt-get update && apt-get install --yes libpq-dev wget # Install sccache to greatly speedup builds in the CI RUN wget https://github.com/mozilla/sccache/releases/download/v0.7.4/sccache-v0.7.4-x86_64-unknown-linux-musl.tar.gz \