From dc272ef7e16ef274fb1f9439e2e16a33c9fe8db3 Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Thu, 23 Jul 2020 05:16:31 +0200 Subject: [PATCH] Fix and improve Docker build --- Dockerfile | 7 +++---- Makefile | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7dfe18e..1e05498 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ -# This Dockerfile results in a super small container containing only the miniserve binary and nothing else. -# Use this in case you don't need any additional tools in the container. -FROM rustlang/rust:nightly as builder +FROM rust as builder ENV APP_HOME /usr/src/app/ +RUN rustup default nightly-2020-07-20 RUN rustup target add x86_64-unknown-linux-musl -RUN apt-get update && apt-get install -y upx musl-tools +RUN apt update && apt-get install -y upx musl-tools COPY . $APP_HOME WORKDIR $APP_HOME diff --git a/Makefile b/Makefile index e76a305..17b9511 100644 --- a/Makefile +++ b/Makefile @@ -13,16 +13,16 @@ endif build-linux: cargo build --target x86_64-unknown-linux-musl --release --locked strip target/x86_64-unknown-linux-musl/release/miniserve - upx target/x86_64-unknown-linux-musl/release/miniserve + upx --lzma target/x86_64-unknown-linux-musl/release/miniserve .PHONY: build-win build-win: RUSTFLAGS="-C linker=x86_64-w64-mingw32-gcc" cargo build --target x86_64-pc-windows-gnu --release --locked strip target/x86_64-pc-windows-gnu/release/miniserve.exe - upx target/x86_64-pc-windows-gnu/release/miniserve.exe + upx --lzma target/x86_64-pc-windows-gnu/release/miniserve.exe .PHONY: build-apple build-apple: cargo build --target x86_64-apple-darwin --release --locked strip target/x86_64-apple-darwin/release/miniserve - upx target/x86_64-apple-darwin/release/miniserve + upx --lzma target/x86_64-apple-darwin/release/miniserve