Skip to content

Commit f943afa

Browse files
author
Remon Lam
committedJun 11, 2018
Merge pull request #6 in DOCI/docker-mysql from 8.0 to master
* commit 'f4e377af1fbf5dbf8802c487fdff47e54fed2828': move to different pool server because of build issues add mysql config files
2 parents 34f1a73 + f4e377a commit f943afa

File tree

3 files changed

+36
-2
lines changed

3 files changed

+36
-2
lines changed
 

Diff for: ‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN set -x \
1717
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
1818
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
1919
&& export GNUPGHOME="$(mktemp -d)" \
20-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
20+
&& gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2121
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
2222
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2323
&& chmod +x /usr/local/bin/gosu \
@@ -43,7 +43,7 @@ RUN set -ex; \
4343
# gpg: key 5072E1F5: public key "MySQL Release Engineering <mysql-build@oss.oracle.com>" imported
4444
key='A4A9406876FCBD3C456770C88C718D3B5072E1F5'; \
4545
export GNUPGHOME="$(mktemp -d)"; \
46-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
46+
gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$key"; \
4747
gpg --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \
4848
rm -rf "$GNUPGHOME"; \
4949
apt-key list > /dev/null

Diff for: ‎config/conf.d/docker.cnf

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[mysqld]
2+
skip-host-cache
3+
skip-name-resolve

Diff for: ‎config/my.cnf

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
2+
#
3+
# This program is free software; you can redistribute it and/or modify
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; version 2 of the License.
6+
#
7+
# This program is distributed in the hope that it will be useful,
8+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
# GNU General Public License for more details.
11+
#
12+
# You should have received a copy of the GNU General Public License
13+
# along with this program; if not, write to the Free Software
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15+
16+
#
17+
# The MySQL Server configuration file.
18+
#
19+
# For explanations see
20+
# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
21+
22+
[mysqld]
23+
pid-file = /var/run/mysqld/mysqld.pid
24+
socket = /var/run/mysqld/mysqld.sock
25+
datadir = /var/lib/mysql
26+
secure-file-priv= NULL
27+
# Disabling symbolic-links is recommended to prevent assorted security risks
28+
symbolic-links=0
29+
30+
# Custom config should go here
31+
!includedir /etc/mysql/conf.d/

0 commit comments

Comments
 (0)
Please sign in to comment.