diff --git a/Makefile b/Makefile index f7eaa8e..c276d79 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ all: debug # Builds debug: - @ ./build -m dev -a run build + @ ./build -m dev .PHONY: debug release: diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder index 62b986e..c2fb526 100644 --- a/docker/Dockerfile.builder +++ b/docker/Dockerfile.builder @@ -1,9 +1,7 @@ -# Our entire toolchain runs in alpine +# We use a multi-stage build to end up with a very small final image FROM alpine:latest AS builder ENV PATH "$PATH:/root/.cargo/bin" -# Needed for proper compiling of openssl-dev -ENV RUSTFLAGS "-C target-feature=-crt-static" WORKDIR /usr/src/app diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel index 6b4e438..e872ab1 100644 --- a/docker/Dockerfile.rel +++ b/docker/Dockerfile.rel @@ -1,5 +1,8 @@ FROM chewingbever/fej-builder:latest AS builder +# Needed for proper compiling of openssl-dev +ENV RUSTFLAGS="-C target-feature=-crt-static" + # And then finally, build the project # Thank the lords that this article exists # https://users.rust-lang.org/t/sigsegv-with-program-linked-against-openssl-in-an-alpine-container/52172