vw_small

commit 07e0fdbd2a918a01397f681cd679dbc5e2770a7b
parent b4dfc24040c1c75d8cc062ffb91c3584ea93f1c0
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Tue,  5 Nov 2019 18:48:06 +0100

Merge pull request #704 from patrickli/bugfix/dockerfiles

Don't install mysql libraries for sqlite builds
Diffstat:
M
docker/aarch64/sqlite/Dockerfile
 | 
3
+--
M
docker/amd64/sqlite/Dockerfile
 | 
6
------
M
docker/amd64/sqlite/Dockerfile.alpine
 | 
6
------
M
docker/armv6/sqlite/Dockerfile
 | 
3
+--
M
docker/armv7/sqlite/Dockerfile
 | 
3
+--

5 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/docker/aarch64/sqlite/Dockerfile b/docker/aarch64/sqlite/Dockerfile
@@ -49,8 +49,7 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \
     && apt-get install -y \
         --no-install-recommends \
         libssl-dev:arm64 \
-        libc6-dev:arm64 \
-        libmariadb-dev:arm64
+        libc6-dev:arm64
 
 ENV CC_aarch64_unknown_linux_gnu="/usr/bin/aarch64-linux-gnu-gcc"
 ENV CROSS_COMPILE="1"
diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile
@@ -34,12 +34,6 @@ ARG DB=sqlite
 #    sqlite3 \
 # && rm -rf /var/lib/apt/lists/*
 
-# Install MySQL package
-RUN apt-get update && apt-get install -y \
-    --no-install-recommends \
-    libmariadb-dev \
-    && rm -rf /var/lib/apt/lists/*
-
 # Creates a dummy project used to grab dependencies
 RUN USER=root cargo new --bin app
 WORKDIR /app
diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine
@@ -29,12 +29,6 @@ ARG DB=sqlite
 
 ENV USER "root"
 
-# Install needed libraries
-RUN apt-get update && apt-get install -y \
-    --no-install-recommends \
-    libmysqlclient-dev \
-    && rm -rf /var/lib/apt/lists/*
-
 WORKDIR /app
 
 # Copies the complete project
diff --git a/docker/armv6/sqlite/Dockerfile b/docker/armv6/sqlite/Dockerfile
@@ -49,8 +49,7 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \
     && apt-get install -y \
         --no-install-recommends \
         libssl-dev:armel \
-        libc6-dev:armel \
-        libmariadb-dev:armel
+        libc6-dev:armel
 
 ENV CC_arm_unknown_linux_gnueabi="/usr/bin/arm-linux-gnueabi-gcc"
 ENV CROSS_COMPILE="1"
diff --git a/docker/armv7/sqlite/Dockerfile b/docker/armv7/sqlite/Dockerfile
@@ -49,8 +49,7 @@ RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \
     && apt-get install -y \
         --no-install-recommends \
         libssl-dev:armhf \
-        libc6-dev:armhf \
-        libmariadb-dev:armhf
+        libc6-dev:armhf
 
 ENV CC_armv7_unknown_linux_gnueabihf="/usr/bin/arm-linux-gnueabihf-gcc"
 ENV CROSS_COMPILE="1"