From 71f1b8fc759bce142f85083128c986b894654e80 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 16 Nov 2022 13:52:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql-5.7.38/dockerfile.2image | 8 ++++++-- mysql-5.7.38/dockerfile.bin2image.ubuntu | 8 ++++++-- mysql-5.7.38/install-db.sh | 5 ++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/mysql-5.7.38/dockerfile.2image b/mysql-5.7.38/dockerfile.2image index ba90c1d..3a4b625 100644 --- a/mysql-5.7.38/dockerfile.2image +++ b/mysql-5.7.38/dockerfile.2image @@ -1,9 +1,13 @@ FROM ubuntu:20.10 as builder MAINTAINER 1793360097@qq.com # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mysql && useradd -r -g mysql mysql +RUN groupadd -r mysql && useradd -r -g mysql mysql && echo > /etc/apt/sources.list COPY install-db.sh /usr/local/bin/ -RUN bash /usr/local/bin/install-db.sh && rm -rf /usr/local/src/* && rm -rf /usr/local/mysql/bin/{mysqltest_embedded,mysql_embedded,mysql_client_test_embedded} /usr/local/mysql/mysql-test +RUN bash /usr/local/bin/install-db.sh Modify_Source DB_Dependent +RUN bash /usr/local/bin/install-db.sh Install_Only_Database pwd \ + && rm -rf /usr/local/src/* \ + && rm -rf /usr/local/mysql/bin/{mysqltest_embedded,mysql_embedded,mysql_client_test_embedded} /usr/local/mysql/mysql-test + RUN mkdir -p /etc/mysql/conf.d/ && echo '[mysqld]\nskip-host-cache\nskip-name-resolve' > /etc/mysql/conf.d/docker.cnf \ && rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql/share /var/run/mysqld \ && chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \ diff --git a/mysql-5.7.38/dockerfile.bin2image.ubuntu b/mysql-5.7.38/dockerfile.bin2image.ubuntu index 70d63a1..fa9d300 100644 --- a/mysql-5.7.38/dockerfile.bin2image.ubuntu +++ b/mysql-5.7.38/dockerfile.bin2image.ubuntu @@ -1,9 +1,13 @@ FROM ubuntu:20.10 MAINTAINER 1793360097@qq.com # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mysql && useradd -r -g mysql mysql +RUN groupadd -r mysql && useradd -r -g mysql mysql && echo > /etc/apt/sources.list COPY install-db.sh /usr/local/bin/ -RUN bash /usr/local/bin/install-db.sh && rm -rf /usr/local/src/* && rm -rf /usr/local/mysql/bin/{mysqltest_embedded,mysql_embedded,mysql_client_test_embedded} /usr/local/mysql/mysql-test +RUN bash /usr/local/bin/install-db.sh Modify_Source DB_Dependent +RUN bash /usr/local/bin/install-db.sh Install_Only_Database \ + && rm -rf /usr/local/src/* \ + && rm -rf /usr/local/mysql/bin/{mysqltest_embedded,mysql_embedded,mysql_client_test_embedded} /usr/local/mysql/mysql-test + RUN mkdir -p /etc/mysql/conf.d/ && echo '[mysqld]\nskip-host-cache\nskip-name-resolve' > /etc/mysql/conf.d/docker.cnf \ && rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql/share /var/run/mysqld \ && chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \ diff --git a/mysql-5.7.38/install-db.sh b/mysql-5.7.38/install-db.sh index 77a7df9..555160e 100644 --- a/mysql-5.7.38/install-db.sh +++ b/mysql-5.7.38/install-db.sh @@ -426,7 +426,10 @@ DB_Dependent() { dpkg -l | grep mysql dpkg -P mysql-server mysql-common libmysqlclient15off libmysqlclient15-dev dpkg -P mariadb-client mariadb-server mariadb-common - apt-get --no-install-recommends install -y debian-keyring debian-archive-keyring build-essential gcc g++ make cmake autoconf automake wget openssl libssl-dev zlib1g zlib1g-dev libncurses5 libncurses5-dev bison libaio-dev libtirpc-dev libsasl2-dev pkg-config libpcre2-dev libxml2-dev libtinfo-dev libnuma-dev gnutls-dev + apt-get --no-install-recommends install -y debian-keyring debian-archive-keyring build-essential gcc g++ make cmake + apt-get --no-install-recommends install -y autoconf automake wget openssl libssl-dev zlib1g zlib1g-dev libncurses5 + apt-get --no-install-recommends install -y libncurses5-dev bison libaio-dev libtirpc-dev libsasl2-dev pkg-config + apt-get --no-install-recommends install -y libpcre2-dev libxml2-dev libtinfo-dev libnuma-dev gnutls-dev fi }