From 6b5fa201aa155bf3d97562734445608b00f468aa Mon Sep 17 00:00:00 2001 From: Jeremy Lin Date: Wed, 26 Aug 2020 23:44:34 -0700 Subject: [PATCH] Fix the Alpine build --- docker/Dockerfile.j2 | 2 +- docker/amd64/Dockerfile.alpine | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index e44e82fb..ef12bfa8 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -113,7 +113,7 @@ RUN apt-get update \ ENV CARGO_HOME "/root/.cargo" ENV USER "root" {% endif %} -{% if "amd64" in target_file %} +{% if "amd64" in target_file and "alpine" not in target_file %} # Install DB packages RUN apt-get update && apt-get install -y \ --no-install-recommends \ diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine index d5dc43e6..fd3ca479 100644 --- a/docker/amd64/Dockerfile.alpine +++ b/docker/amd64/Dockerfile.alpine @@ -32,12 +32,6 @@ RUN rustup set profile minimal ENV USER "root" ENV RUSTFLAGS='-C link-arg=-s' -# Install DB packages -RUN apt-get update && apt-get install -y \ - --no-install-recommends \ - libmariadb-dev \ - libpq-dev \ - && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies RUN USER=root cargo new --bin /app