Skip to content

Commit f5733ab

Browse files
author
MySQL Build Team
committed
Release version 1.1.12-cluster
* Bump shell version to 8.0.17 * Bump cluster versions for 1.1.12 release * Bump shell version to 8.0.16 * Remove unneeded flush privilege command * Add dummy 8.0 contents to fix file generation * Bump versions for 1.1.11 release * Add cluster 8.0 image
1 parent a5b87a2 commit f5733ab

File tree

12 files changed

+383
-14
lines changed

12 files changed

+383
-14
lines changed

7.5/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
FROM oraclelinux:7-slim
1717

18-
ARG MYSQL_CLUSTER_PACKAGE=mysql-cluster-community-server-minimal-7.5.13
19-
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.14
18+
ARG MYSQL_CLUSTER_PACKAGE=mysql-cluster-community-server-minimal-7.5.15
19+
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.17
2020

2121
# Install server
2222
RUN yum install -y \

7.5/docker-entrypoint.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
set -e
1818

19-
echo "[Entrypoint] MySQL Docker Image 7.5.13-1.1.9-cluster"
19+
echo "[Entrypoint] MySQL Docker Image 7.5.15-1.1.12-cluster"
2020
# Fetch value from server config
2121
# We use mysqld --verbose --help instead of my_print_defaults because the
2222
# latter only show values present in config files, and not server defaults
@@ -135,7 +135,6 @@ EOF
135135
echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" | "${mysql[@]}"
136136
fi
137137

138-
echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}"
139138
elif [ "$MYSQL_USER" -a ! "$MYSQL_PASSWORD" -o ! "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
140139
echo '[Entrypoint] Not creating mysql user. MYSQL_USER and MYSQL_PASSWORD must be specified to create a mysql user.'
141140
fi
@@ -191,7 +190,7 @@ password=healthcheckpass
191190
EOF
192191
touch /mysql-init-complete
193192
chown -R mysql:mysql "$DATADIR"
194-
echo "[Entrypoint] Starting MySQL 7.5.13-1.1.9-cluster"
193+
echo "[Entrypoint] Starting MySQL 7.5.15-1.1.12-cluster"
195194

196195
elif [ "$1" == "ndb_mgmd" ]; then
197196
echo "[Entrypoint] Starting ndb_mgmd"

7.5/inspec/control.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
impact 0.5
1313
describe package('mysql-cluster-community-server-minimal') do
1414
it { should be_installed }
15-
its ('version') { should match '7.5.13.*' }
15+
its ('version') { should match '7.5.15.*' }
1616
end
1717
describe package('mysql-shell') do
1818
it { should be_installed }
19-
its ('version') { should match '8.0.14.*' }
19+
its ('version') { should match '8.0.17.*' }
2020
end
2121
end

7.6/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
FROM oraclelinux:7-slim
1717

18-
ARG MYSQL_CLUSTER_PACKAGE=mysql-cluster-community-server-minimal-7.6.9
19-
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.14
18+
ARG MYSQL_CLUSTER_PACKAGE=mysql-cluster-community-server-minimal-7.6.11
19+
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.17
2020

2121
# Install server
2222
RUN yum install -y \

7.6/docker-entrypoint.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
set -e
1818

19-
echo "[Entrypoint] MySQL Docker Image 7.6.9-1.1.9-cluster"
19+
echo "[Entrypoint] MySQL Docker Image 7.6.11-1.1.12-cluster"
2020
# Fetch value from server config
2121
# We use mysqld --verbose --help instead of my_print_defaults because the
2222
# latter only show values present in config files, and not server defaults
@@ -135,7 +135,6 @@ EOF
135135
echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" | "${mysql[@]}"
136136
fi
137137

138-
echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}"
139138
elif [ "$MYSQL_USER" -a ! "$MYSQL_PASSWORD" -o ! "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
140139
echo '[Entrypoint] Not creating mysql user. MYSQL_USER and MYSQL_PASSWORD must be specified to create a mysql user.'
141140
fi
@@ -191,7 +190,7 @@ password=healthcheckpass
191190
EOF
192191
touch /mysql-init-complete
193192
chown -R mysql:mysql "$DATADIR"
194-
echo "[Entrypoint] Starting MySQL 7.6.9-1.1.9-cluster"
193+
echo "[Entrypoint] Starting MySQL 7.6.11-1.1.12-cluster"
195194

196195
elif [ "$1" == "ndb_mgmd" ]; then
197196
echo "[Entrypoint] Starting ndb_mgmd"

7.6/inspec/control.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
impact 0.5
1313
describe package('mysql-cluster-community-server-minimal') do
1414
it { should be_installed }
15-
its ('version') { should match '7.6.9.*' }
15+
its ('version') { should match '7.6.11.*' }
1616
end
1717
describe package('mysql-shell') do
1818
it { should be_installed }
19-
its ('version') { should match '8.0.14.*' }
19+
its ('version') { should match '8.0.17.*' }
2020
end
2121
end

8.0/Dockerfile

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Copyright (c) 2017, 2018, 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+
FROM oraclelinux:7-slim
17+
18+
ARG MYSQL_CLUSTER_PACKAGE=mysql-cluster-community-server-minimal-8.0.17
19+
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.17
20+
21+
# Install server
22+
RUN yum install -y \
23+
https://repo.mysql.com/mysql-cluster-community-minimal-release-el7.rpm \
24+
https://repo.mysql.com/mysql-community-release-el7.rpm \
25+
&& yum-config-manager --enable mysql-cluster80-minimal \
26+
&& yum install -y \
27+
$MYSQL_CLUSTER_PACKAGE \
28+
$MYSQL_SHELL_PACKAGE \
29+
libpwquality \
30+
&& yum clean all \
31+
&& mkdir /docker-entrypoint-initdb.d
32+
33+
VOLUME /var/lib/mysql
34+
35+
COPY docker-entrypoint.sh /entrypoint.sh
36+
COPY healthcheck.sh /healthcheck.sh
37+
COPY cnf/my.cnf /etc/
38+
COPY cnf/mysql-cluster.cnf /etc/
39+
40+
ENTRYPOINT ["/entrypoint.sh"]
41+
EXPOSE 3306 33060 2202 1186
42+
HEALTHCHECK CMD /healthcheck.sh
43+
CMD ["mysqld"]
44+

8.0/cnf/my.cnf

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
[mysqld]
17+
ndbcluster
18+
ndb-connectstring=192.168.0.2
19+
user=mysql
20+
21+
[mysql_cluster]
22+
ndb-connectstring=192.168.0.2

8.0/cnf/mysql-cluster.cnf

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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+
[ndbd default]
17+
NoOfReplicas=2
18+
DataMemory=80M
19+
IndexMemory=18M
20+
21+
22+
[ndb_mgmd]
23+
NodeId=1
24+
hostname=192.168.0.2
25+
datadir=/var/lib/mysql
26+
27+
[ndbd]
28+
NodeId=2
29+
hostname=192.168.0.3
30+
datadir=/var/lib/mysql
31+
32+
[ndbd]
33+
NodeId=3
34+
hostname=192.168.0.4
35+
datadir=/var/lib/mysql
36+
37+
[mysqld]
38+
NodeId=4
39+
hostname=192.168.0.10

0 commit comments

Comments
 (0)