Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to clux/muslrust:stable #2392

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ steps:

# use minimum supported rust version for most steps
- name: prepare repo
image: clux/muslrust:1.57.0
image: clux/muslrust:stable
user: root
commands:
- git fetch --tags
Expand All @@ -25,14 +25,14 @@ steps:

# latest rust for clippy to get extra checks
- name: cargo clippy
image: rust:1.61-buster
image: rust:1-buster
commands:
- rustup component add clippy
- cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro
- cargo clippy --workspace --all-features -- -D clippy::unwrap_used

- name: cargo test
image: clux/muslrust:1.57.0
image: clux/muslrust:stable
environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
LEMMY_CONFIG_LOCATION: ../../config/config.hjson
Expand All @@ -44,20 +44,20 @@ steps:
- cargo test --workspace --no-fail-fast --all-features

- name: check defaults.hjson updated
image: clux/muslrust:1.57.0
image: clux/muslrust:stable
commands:
- ./scripts/update_config_defaults.sh config/defaults_current.hjson
- diff config/defaults.hjson config/defaults_current.hjson

- name: check with different features
image: clux/muslrust:1.57.0
image: clux/muslrust:stable
commands:
- cargo install cargo-workspaces
- cargo workspaces exec cargo check --no-default-features
- cargo workspaces exec cargo check --all-features

- name: cargo build
image: clux/muslrust:1.57.0
image: clux/muslrust:stable
commands:
- cargo build
- mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server
Expand Down Expand Up @@ -171,7 +171,7 @@ platform:
steps:

- name: prepare repo
image: rust:1.57-slim
image: rust:1-slim
user: root
commands:
- chown 1000:1000 . -R
Expand Down
2 changes: 1 addition & 1 deletion docker/dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUST_BUILDER_IMAGE=clux/muslrust:1.59.0
ARG RUST_BUILDER_IMAGE=clux/muslrust:stable

FROM $RUST_BUILDER_IMAGE as chef
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker/prod/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the project
FROM clux/muslrust:1.59.0 as builder
FROM clux/muslrust:stable as builder

ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
ARG RUSTRELEASEDIR="release"
Expand Down
2 changes: 1 addition & 1 deletion docker/prod/Dockerfile.arm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUST_BUILDER_IMAGE=rust:1.60-slim-buster
ARG RUST_BUILDER_IMAGE=rust:1-slim-buster

# Build Lemmy
FROM $RUST_BUILDER_IMAGE as builder
Expand Down