vw_small

commit ff2684dfeedc70b5d1b0afbe41b52d01cd8e0eb1
parent 7167e443ca0eb70c691dac9ba20e0ade09bb0523
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Thu, 27 Aug 2020 12:34:36 +0200

Merge pull request #1116 from jjlin/docker

Fix the Alpine build
Diffstat:
M
docker/Dockerfile.j2
 | 
2
+-
M
docker/amd64/Dockerfile.alpine
 | 
6
------

2 files changed, 1 insertion(+), 7 deletions(-)
diff --git 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
@@ -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