From e96be80410c9aa18cafad12f605a5f8cfb87cac2 Mon Sep 17 00:00:00 2001 From: Asif Bacchus Date: Sat, 28 Nov 2020 02:48:27 -0700 Subject: [PATCH] enable TCP networking in default config vs cmdline --- Dockerfile | 5 +++-- entrypoint.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f1909c9..e6716f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,12 +14,13 @@ LABEL org.label-schema.url="https://git.asifbacchus.app/ab-docker/mariadb-alpine LABEL org.label-schema.usage="https://git.asifbacchus.app/ab-docker/mariadb-alpine/wiki" LABEL org.label-schema.vcs-url="https://git.asifbacchus.app/ab-docker/mariadb-alpine.git" -# install mariadb +# install mariadb and turn on TCP connection in default config RUN apk --no-cache add \ tzdata \ mariadb \ mariadb-client \ mariadb-server-utils \ + sed -i 's/skip-networking/skip-networking=0/' /etc/my.cnf.d/mariadb-server.cnf \ && rm -f /var/cache/apk/* # expose ports @@ -48,7 +49,7 @@ RUN mkdir -p /docker-entrypoint-preinit.d \ # set entrypoint and default command ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] -CMD [ "/usr/bin/mysqld", "--user=mysql", "--console", "--skip-name-resolve", "--skip-networking=0" ] +CMD [ "/usr/bin/mysqld", "--user=mysql", "--console", "--skip-name-resolve" ] # add build date and version labels ARG BUILD_DATE diff --git a/entrypoint.sh b/entrypoint.sh index 427dc7a..32b1fdc 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -119,8 +119,8 @@ printf "(mySQL root password: %s)\n\n" "$MYSQL_ROOT_PASSWORD" # process CMD sent to this container case "$1" in -*) - # param starts with '-' --> assume mysqld options and append to CMD - set -- /usr/bin/mysqld --user=mysql --console --skip-name-resolve --skip-networking=0 "$@" + # param starts with '-' --> assume mysqld parameter(s) and append to CMD + set -- /usr/bin/mysqld --user=mysql --console --skip-name-resolve "$@" printf "\nExecuting: %s\n" "$*" exec "$@" ;;