From 494ba396f76b407752dfc08705dd663815f1f275 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 3 May 2021 10:46:12 -0400 Subject: [PATCH] Updating to rust 1.51.0 (#1598) --- .drone.yml | 14 +++++++------- docker/dev/Dockerfile | 2 +- docker/dev/volume_mount.dockerfile | 2 +- docker/prod/Dockerfile | 2 +- docker/prod/Dockerfile.arm | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index f4818556d..c49790d9b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ platform: steps: - name: prepare repo - image: ekidd/rust-musl-builder:1.50.0 + image: ekidd/rust-musl-builder:1.51.0 user: root commands: - chown 1000:1000 . -R @@ -21,13 +21,13 @@ steps: - /root/.cargo/bin/cargo fmt -- --check - name: cargo clippy - image: ekidd/rust-musl-builder:1.50.0 + image: ekidd/rust-musl-builder:1.51.0 commands: - 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 -- -D clippy::unwrap_used - name: cargo test - image: ekidd/rust-musl-builder:1.50.0 + image: ekidd/rust-musl-builder:1.51.0 environment: LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_CONFIG_LOCATION: ../../config/config.hjson @@ -39,7 +39,7 @@ steps: - cargo test --workspace --no-fail-fast - name: cargo build - image: ekidd/rust-musl-builder:1.50.0 + image: ekidd/rust-musl-builder:1.51.0 commands: - cargo build - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server @@ -138,7 +138,7 @@ platform: steps: - name: prepare repo - image: rust:1.50-slim-buster + image: rust:1.51-slim-buster user: root commands: - chown 1000:1000 . -R @@ -147,7 +147,7 @@ steps: - git fetch --tags - name: cargo test - image: rust:1.50-slim-buster + image: rust:1.51-slim-buster environment: LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_CONFIG_LOCATION: ../../config/config.hjson @@ -161,7 +161,7 @@ steps: # Using Debian here because there seems to be no official Alpine-based Rust docker image for ARM. - name: cargo build - image: rust:1.50-slim-buster + image: rust:1.51-slim-buster commands: - apt-get update - apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 4b7dc3ad4..071d59e54 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -1,4 +1,4 @@ -ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.50.0 +ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.51.0 # Cargo chef plan FROM $RUST_BUILDER_IMAGE as planner diff --git a/docker/dev/volume_mount.dockerfile b/docker/dev/volume_mount.dockerfile index 6d9fa996c..ae902e938 100644 --- a/docker/dev/volume_mount.dockerfile +++ b/docker/dev/volume_mount.dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:experimental # Warning: this will not pick up migrations unless there are code changes -FROM rust:1.50-buster as rust +FROM rust:1.51-buster as rust ENV HOME=/home/root diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index b869a7667..f6a2b06f6 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -1,5 +1,5 @@ # Build the project -FROM ekidd/rust-musl-builder:1.50.0 as builder +FROM ekidd/rust-musl-builder:1.51.0 as builder ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl ARG RUSTRELEASEDIR="release" diff --git a/docker/prod/Dockerfile.arm b/docker/prod/Dockerfile.arm index 01f24456e..539a2ae72 100644 --- a/docker/prod/Dockerfile.arm +++ b/docker/prod/Dockerfile.arm @@ -1,4 +1,4 @@ -ARG RUST_BUILDER_IMAGE=rust:1.50-slim-buster +ARG RUST_BUILDER_IMAGE=rust:1.51.0-slim-buster # Build Lemmy FROM $RUST_BUILDER_IMAGE as builder