From 42cb94e1f49cc9d4f09df7f70c075d9cc806ef24 Mon Sep 17 00:00:00 2001 From: Thearas Date: Wed, 26 Jan 2022 18:17:10 +0800 Subject: [PATCH 1/3] fix: docker image failed to boot on arm64 node --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index ff88d5bc6..b85f5ffe1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,10 @@ COPY meilisearch-http/Cargo.toml meilisearch-http/ COPY meilisearch-lib/Cargo.toml meilisearch-lib/ ENV RUSTFLAGS="-C target-feature=-crt-static" +# Issue #2115 +RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ + export JEMALLOC_SYS_WITH_LG_PAGE=16; \ + fi # Create dummy main.rs files for each workspace member to be able to compile all the dependencies RUN find . -type d -name "meilisearch-*" | xargs -I{} sh -c 'mkdir {}/src; echo "fn main() { }" > {}/src/main.rs;' From 41db2601a60372e278998345879938254fb4921e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine=20Urquizar=20-=20curqui?= Date: Mon, 14 Feb 2022 10:44:03 +0100 Subject: [PATCH 2/3] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b85f5ffe1..9ad419bd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,6 @@ COPY meilisearch-http/Cargo.toml meilisearch-http/ COPY meilisearch-lib/Cargo.toml meilisearch-lib/ ENV RUSTFLAGS="-C target-feature=-crt-static" -# Issue #2115 RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ export JEMALLOC_SYS_WITH_LG_PAGE=16; \ fi From d0ddbcc2b28195b62dd146f1af10f8ca48dcbfb2 Mon Sep 17 00:00:00 2001 From: Thearas Date: Mon, 14 Feb 2022 18:08:57 +0800 Subject: [PATCH 3/3] update --- Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9ad419bd1..075dede67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,14 +17,14 @@ COPY meilisearch-http/Cargo.toml meilisearch-http/ COPY meilisearch-lib/Cargo.toml meilisearch-lib/ ENV RUSTFLAGS="-C target-feature=-crt-static" -RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ - export JEMALLOC_SYS_WITH_LG_PAGE=16; \ - fi # Create dummy main.rs files for each workspace member to be able to compile all the dependencies RUN find . -type d -name "meilisearch-*" | xargs -I{} sh -c 'mkdir {}/src; echo "fn main() { }" > {}/src/main.rs;' # Use `cargo build` instead of `cargo vendor` because we need to not only download but compile dependencies too -RUN $HOME/.cargo/bin/cargo build --release +RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ + export JEMALLOC_SYS_WITH_LG_PAGE=16; \ + fi && \ + $HOME/.cargo/bin/cargo build --release # Cleanup dummy main.rs files RUN find . -path "*/src/main.rs" -delete @@ -33,7 +33,10 @@ ARG COMMIT_DATE ENV COMMIT_SHA=${COMMIT_SHA} COMMIT_DATE=${COMMIT_DATE} COPY . . -RUN $HOME/.cargo/bin/cargo build --release +RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ + export JEMALLOC_SYS_WITH_LG_PAGE=16; \ + fi && \ + $HOME/.cargo/bin/cargo build --release # Run FROM alpine:3.14