From 47a5a4e1fcba7c89e6fba90a23c05b6353b0c013 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Tue, 31 Dec 2019 15:28:23 +0100 Subject: [PATCH] Fix package name for Ubuntu 16.04 based image. Thanks @dani-garcia! --- docker/Dockerfile.j2 | 4 ++++ docker/amd64/mysql/Dockerfile.alpine | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index dd64be42..42611420 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -140,7 +140,11 @@ ENV USER "root" # Install MySQL package RUN apt-get update && apt-get install -y \ --no-install-recommends \ +{% if "musl" in build_stage_base_image %} + libmysqlclient-dev{{ package_arch_prefix }} \ +{% else %} libmariadb-dev{{ package_arch_prefix }} \ +{% endif %} && rm -rf /var/lib/apt/lists/* {% elif "postgresql" in target_file %} diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine index a3d11b19..295ef3c6 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -35,7 +35,7 @@ ENV USER "root" # Install MySQL package RUN apt-get update && apt-get install -y \ --no-install-recommends \ - libmariadb-dev \ + libmysqlclient-dev \ && rm -rf /var/lib/apt/lists/* # Creates a dummy project used to grab dependencies