Skip to content

Commit e2a7a94

Browse files
author
MySQL Build Team
committed
Release version 1.1.18
 * Remove references to 5.5 * Bumped shell versions for 8.0.22 release * Bumped versions for October20 release * Escape ampersand in gen_dockerfiles.sh replacement value * BUG#31627536 Expose GR port for server 8.0
1 parent c98cb34 commit e2a7a94

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

‎5.6/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515
FROM oraclelinux:7-slim
1616

17-
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-5.6.49
17+
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-5.6.50
1818
ARG MYSQL_SHELL_PACKAGE=
1919

2020
# Install server

‎5.6/docker-entrypoint.sh

Lines changed: 3 additions & 3 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 5.6.49-1.1.17"
18+
echo "[Entrypoint] MySQL Docker Image 5.6.50-1.1.18"
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
@@ -35,7 +35,7 @@ if [ "$1" = 'mysqld' ]; then
3535
# Test that the server can start. We redirect stdout to /dev/null so
3636
# only the error messages are left.
3737
result=0
38-
output=$("$@" --verbose --help 2>%%VALIDATE_CONFIG%%1 > /dev/null) || result=$?
38+
output=$("$@" --verbose --help 2>&1 > /dev/null) || result=$?
3939
if [ ! "$result" = "0" ]; then
4040
echo >&2 '[Entrypoint] ERROR: Unable to start MySQL. Please check your configuration.'
4141
echo >&2 "[Entrypoint] $output"
@@ -201,7 +201,7 @@ password=healthcheckpass
201201
EOF
202202
touch /mysql-init-complete
203203
chown -R mysql:mysql "$DATADIR"
204-
echo "[Entrypoint] Starting MySQL 5.6.49-1.1.17"
204+
echo "[Entrypoint] Starting MySQL 5.6.50-1.1.18"
205205
fi
206206

207207
exec "$@"

‎5.6/inspec/control.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
impact 0.5
1313
describe package('mysql-community-server-minimal') do
1414
it { should be_installed }
15-
its ('version') { should match '5.6.49.*' }
15+
its ('version') { should match '5.6.50.*' }
1616
end
1717
end

‎5.7/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515
FROM oraclelinux:7-slim
1616

17-
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-5.7.31
18-
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.21
17+
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-5.7.32
18+
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.22
1919

2020
# Install server
2121
RUN yum install -y https://repo.mysql.com/mysql-community-minimal-release-el7.rpm \

‎5.7/docker-entrypoint.sh

Lines changed: 3 additions & 3 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 5.7.31-1.1.17"
18+
echo "[Entrypoint] MySQL Docker Image 5.7.32-1.1.18"
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
@@ -35,7 +35,7 @@ if [ "$1" = 'mysqld' ]; then
3535
# Test that the server can start. We redirect stdout to /dev/null so
3636
# only the error messages are left.
3737
result=0
38-
output=$("$@" --verbose --help 2>%%VALIDATE_CONFIG%%1 > /dev/null) || result=$?
38+
output=$("$@" --verbose --help 2>&1 > /dev/null) || result=$?
3939
if [ ! "$result" = "0" ]; then
4040
echo >&2 '[Entrypoint] ERROR: Unable to start MySQL. Please check your configuration.'
4141
echo >&2 "[Entrypoint] $output"
@@ -201,7 +201,7 @@ password=healthcheckpass
201201
EOF
202202
touch /mysql-init-complete
203203
chown -R mysql:mysql "$DATADIR"
204-
echo "[Entrypoint] Starting MySQL 5.7.31-1.1.17"
204+
echo "[Entrypoint] Starting MySQL 5.7.32-1.1.18"
205205
fi
206206

207207
exec "$@"

‎5.7/inspec/control.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
impact 0.5
1313
describe package('mysql-community-server-minimal') do
1414
it { should be_installed }
15-
its ('version') { should match '5.7.31.*' }
15+
its ('version') { should match '5.7.32.*' }
1616
end
1717
end
1818
control 'shell-package' do
1919
impact 0.5
2020
describe package('mysql-shell') do
2121
it { should be_installed }
22-
its ('version') { should match '8.0.21.*' }
22+
its ('version') { should match '8.0.22.*' }
2323
end
2424
end

‎8.0/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515
FROM oraclelinux:7-slim
1616

17-
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-8.0.21
18-
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.21
17+
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-8.0.22
18+
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.22
1919

2020
# Install server
2121
RUN yum install -y https://repo.mysql.com/mysql-community-minimal-release-el7.rpm \
@@ -34,6 +34,6 @@ COPY docker-entrypoint.sh /entrypoint.sh
3434
COPY healthcheck.sh /healthcheck.sh
3535
ENTRYPOINT ["/entrypoint.sh"]
3636
HEALTHCHECK CMD /healthcheck.sh
37-
EXPOSE 3306 33060
37+
EXPOSE 3306 33060 33061
3838
CMD ["mysqld"]
3939

‎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.21-1.1.17"
18+
echo "[Entrypoint] MySQL Docker Image 8.0.22-1.1.18"
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
@@ -201,7 +201,7 @@ password=healthcheckpass
201201
EOF
202202
touch /mysql-init-complete
203203
chown -R mysql:mysql "$DATADIR"
204-
echo "[Entrypoint] Starting MySQL 8.0.21-1.1.17"
204+
echo "[Entrypoint] Starting MySQL 8.0.22-1.1.18"
205205
fi
206206

207207
env MYSQLD_PARENT_PID=$$ "$@"

‎8.0/inspec/control.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
it { should exist }
55
it { should be_running }
66
its('repo') { should eq 'mysql/mysql-server' }
7-
its('ports') { should eq '3306/tcp, 33060/tcp' }
7+
its('ports') { should eq '3306/tcp, 33060-33061/tcp' }
88
its('command') { should match '/entrypoint.sh mysqld' }
99
end
1010
end
1111
control 'server-package' do
1212
impact 0.5
1313
describe package('mysql-community-server-minimal') do
1414
it { should be_installed }
15-
its ('version') { should match '8.0.21.*' }
15+
its ('version') { should match '8.0.22.*' }
1616
end
1717
end
1818
control 'shell-package' do
1919
impact 0.5
2020
describe package('mysql-shell') do
2121
it { should be_installed }
22-
its ('version') { should match '8.0.21.*' }
22+
its ('version') { should match '8.0.22.*' }
2323
end
2424
end

0 commit comments

Comments
 (0)