From 4a32349c9cfac368756d47d5828d7ee34f72a068 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Tue, 13 Apr 2021 21:43:30 +0200 Subject: [PATCH] Fixed instant crash on ivago endpoint (#19) --- Makefile | 2 +- docker/Dockerfile.builder | 4 +++- docker/Dockerfile.rel | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c276d79..f7eaa8e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ all: debug # Builds debug: - @ ./build -m dev + @ ./build -m dev -a run build .PHONY: debug release: diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder index c2fb526..62b986e 100644 --- a/docker/Dockerfile.builder +++ b/docker/Dockerfile.builder @@ -1,7 +1,9 @@ -# We use a multi-stage build to end up with a very small final image +# Our entire toolchain runs in alpine 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 e872ab1..6b4e438 100644 --- a/docker/Dockerfile.rel +++ b/docker/Dockerfile.rel @@ -1,8 +1,5 @@ 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