Skip to content

Commit 3e1702c

Browse files
author
MySQL Build Team
committed
Release version 1.2.17-cluster
 * ET#81589: Bump versions for July 8.0.38/8.4.1/9.0.0 Docker releases * ET#81519 - Set weekly innovation version to 9.1.0 and remove any unused code
1 parent e80a40f commit 3e1702c

File tree

13 files changed

+454
-13
lines changed

13 files changed

+454
-13
lines changed

‎mysql-cluster/8.0/Dockerfile

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

1616
FROM container-registry.oracle.com/os/oraclelinux:9-slim
1717

18-
ARG MYSQL_SERVER_PACKAGE=mysql-cluster-community-server-minimal-8.0.37
19-
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.37
18+
ARG MYSQL_SERVER_PACKAGE=mysql-cluster-community-server-minimal-8.0.38
19+
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.38
2020

2121
# Setup repositories for minimal packages (all versions)
2222
RUN rpm -U http://repo.mysql.oraclecorp.com/mysql-uat/repos-stage/mysql-cluster-community-minimal-release-el9.rpm \
23-
&& rpm -U http://repo.mysql.oraclecorp.com/mysql-uat/repos-stage/mysql80-community-release-el9.rpm
23+
&& rpm -U http://repo.mysql.oraclecorp.com/mysql-uat/repos-stage/mysql84-community-release-el9.rpm
2424

2525
# Install server and shell 8.0
2626
RUN microdnf update && echo "[main]" > /etc/dnf/dnf.conf \

‎mysql-cluster/8.0/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1616
set -e
1717

18-
echo "[Entrypoint] MySQL Docker Image 8.0.37-1.2.16-cluster"
18+
echo "[Entrypoint] MySQL Docker Image 8.0.38-1.2.17-cluster"
1919
# Fetch value from server config
2020
# We use mysqld --verbose --help instead of my_print_defaults because the
2121
# latter only show values present in config files, and not server defaults
@@ -227,7 +227,7 @@ EOF
227227
echo "[Entrypoint] MYSQL_INITIALIZE_ONLY is set, exiting without starting MySQL..."
228228
exit 0
229229
else
230-
echo "[Entrypoint] Starting MySQL 8.0.37-1.2.16-cluster"
230+
echo "[Entrypoint] Starting MySQL 8.0.38-1.2.17-cluster"
231231
fi
232232
export MYSQLD_PARENT_PID=$$ ; exec "$@" --user=
233233
else

‎mysql-cluster/8.0/inspec/control.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
impact 0.5
1212
describe package('mysql-cluster-community-server-minimal') do
1313
it { should be_installed }
14-
its ('version') { should match '8.0.37.*' }
14+
its ('version') { should match '8.0.38.*' }
1515
end
1616
describe package('mysql-shell') do
1717
it { should be_installed }
18-
its ('version') { should match '8.0.37.*' }
18+
its ('version') { should match '8.0.38.*' }
1919
end
2020
end

‎mysql-cluster/8.4/Dockerfile

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

1616
FROM container-registry.oracle.com/os/oraclelinux:9-slim
1717

18-
ARG MYSQL_SERVER_PACKAGE=mysql-cluster-community-server-minimal-8.4.0
19-
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.4.0
18+
ARG MYSQL_SERVER_PACKAGE=mysql-cluster-community-server-minimal-8.4.1
19+
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.4.1
2020

2121
# Setup repositories for minimal packages (all versions)
2222
RUN rpm -U http://repo.mysql.oraclecorp.com/mysql-uat/repos-stage/mysql-cluster-community-minimal-release-el9.rpm \

‎mysql-cluster/8.4/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1616
set -e
1717

18-
echo "[Entrypoint] MySQL Docker Image 8.4.0-1.2.16-cluster"
18+
echo "[Entrypoint] MySQL Docker Image 8.4.1-1.2.17-cluster"
1919
# Fetch value from server config
2020
# We use mysqld --verbose --help instead of my_print_defaults because the
2121
# latter only show values present in config files, and not server defaults
@@ -227,7 +227,7 @@ EOF
227227
echo "[Entrypoint] MYSQL_INITIALIZE_ONLY is set, exiting without starting MySQL..."
228228
exit 0
229229
else
230-
echo "[Entrypoint] Starting MySQL 8.4.0-1.2.16-cluster"
230+
echo "[Entrypoint] Starting MySQL 8.4.1-1.2.17-cluster"
231231
fi
232232
export MYSQLD_PARENT_PID=$$ ; exec "$@" --user=
233233
else

‎mysql-cluster/8.4/inspec/control.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
impact 0.5
1212
describe package('mysql-cluster-community-server-minimal') do
1313
it { should be_installed }
14-
its ('version') { should match '8.4.0.*' }
14+
its ('version') { should match '8.4.1.*' }
1515
end
1616
describe package('mysql-shell') do
1717
it { should be_installed }
18-
its ('version') { should match '8.4.0.*' }
18+
its ('version') { should match '8.4.1.*' }
1919
end
2020
end

‎mysql-cluster/9.0/Dockerfile

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
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 container-registry.oracle.com/os/oraclelinux:9-slim
17+
18+
ARG MYSQL_SERVER_PACKAGE=mysql-cluster-community-server-minimal-9.0.0
19+
ARG MYSQL_SHELL_PACKAGE=mysql-shell-9.0.0
20+
21+
# Setup repositories for minimal packages (all versions)
22+
RUN rpm -U http://repo.mysql.oraclecorp.com/mysql-uat/repos-stage/mysql-cluster-community-minimal-release-el9.rpm \
23+
&& rpm -U http://repo.mysql.oraclecorp.com/mysql-uat/repos-stage/mysql84-community-release-el9.rpm
24+
25+
# Install server and shell 8.0
26+
RUN microdnf update && echo "[main]" > /etc/dnf/dnf.conf \
27+
&& microdnf install -y --enablerepo=mysql-tools-innovation-community $MYSQL_SHELL_PACKAGE \
28+
&& microdnf install -y --disablerepo=ol9_appstream \
29+
--enablerepo=mysql-cluster-innovation-community-minimal $MYSQL_SERVER_PACKAGE \
30+
&& microdnf clean all \
31+
&& mkdir /docker-entrypoint-initdb.d
32+
33+
COPY prepare-image.sh /
34+
RUN /prepare-image.sh && rm -f /prepare-image.sh
35+
36+
ENV MYSQL_UNIX_PORT /var/lib/mysql/mysql.sock
37+
38+
COPY docker-entrypoint.sh /entrypoint.sh
39+
COPY healthcheck.sh /healthcheck.sh
40+
COPY cnf/my.cnf /etc/
41+
COPY cnf/mysql-cluster.cnf /etc/
42+
43+
ENTRYPOINT ["/entrypoint.sh"]
44+
HEALTHCHECK CMD /healthcheck.sh
45+
EXPOSE 3306 33060-33061 2202 1186
46+
CMD ["mysqld"]
47+

‎mysql-cluster/9.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

‎mysql-cluster/9.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)