From e42eee2c54bd6f2c776c9e3542a06b8d78d07cea Mon Sep 17 00:00:00 2001 From: trivernis Date: Tue, 10 Nov 2020 14:57:41 +0100 Subject: [PATCH] Fix docker build for arm Signed-off-by: trivernis --- alpine.dockerfile | 3 +-- scratch.dockerfile | 3 +-- src/server/mod.rs | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/alpine.dockerfile b/alpine.dockerfile index 5751b03..8d35524 100644 --- a/alpine.dockerfile +++ b/alpine.dockerfile @@ -1,5 +1,4 @@ -FROM rust:alpine AS builder -RUN apk add --no-cache libgcc musl-dev +FROM rust AS builder WORKDIR /usr/src RUN USER=root cargo new snekcloud-server WORKDIR /usr/src/snekcloud-server diff --git a/scratch.dockerfile b/scratch.dockerfile index 0f48d06..b35006b 100644 --- a/scratch.dockerfile +++ b/scratch.dockerfile @@ -1,5 +1,4 @@ -FROM rust:alpine AS builder -RUN apk add --no-cache libgcc musl-dev +FROM rust AS builder WORKDIR /usr/src RUN USER=root cargo new snekcloud-server WORKDIR /usr/src/snekcloud-server diff --git a/src/server/mod.rs b/src/server/mod.rs index 276b777..a05e0da 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -4,7 +4,7 @@ use crate::utils::result::{SnekcloudError, SnekcloudResult}; use crate::utils::settings::get_settings; use parking_lot::Mutex; use scheduled_thread_pool::ScheduledThreadPool; -use std::cmp::{max, min}; +use std::cmp::max; use std::collections::HashMap; use std::mem; use std::sync::mpsc::channel;