Browse Source
Merge pull request #704 from patrickli/bugfix/dockerfiles
Don't install mysql libraries for sqlite builds
pull/710/head
Daniel García
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
3 additions and
18 deletions
-
docker/aarch64/sqlite/Dockerfile
-
docker/amd64/sqlite/Dockerfile
-
docker/amd64/sqlite/Dockerfile.alpine
-
docker/armv6/sqlite/Dockerfile
-
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: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" |
|
|
|
|
|
@ -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 |
|
|
|
|
|
@ -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 |
|
|
|
|
|
@ -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" |
|
|
|
|
|
@ -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" |
|
|
|