Skip to content

Commit 09b0d30

Browse files
rluisrrluisr
authored
Merge pull request #10 from rluisr/8.1
MySQL 8.1 / 8.0.34
2 parents 4395fd9 + 2548e6b commit 09b0d30

16 files changed

+83
-51
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.env
22
.envrc
3+
test/.envrc

‎.idea/aws.xml

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ client for getting mysql-router information.
66

77
Supported version
88
-----------------
9-
- 20190715 (8.0.17 - 8.0.32)
9+
- 20190715 (8.0.17 - 8.0.34 / 8.1.0)
1010

1111
Enable HTTP Server and REST API
1212
-------------------------------

‎test/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION=8.0.32
1+
VERSION=8.1.0

‎test/.envrc

-1
This file was deleted.

‎test/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ test:
22
docker compose up --build --force-recreate --always-recreate-deps --renew-anon-volumes -d
33
docker exec test-mysqlrouter-go-test-1 sh -c "bash /go/src/mysqlrouter-go/entrypoint.sh"
44

5-
down:
5+
clean:
66
docker compose down
77
docker compose rm -f
88

9-
local: test down
9+
local: test clean

‎test/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
docker compose up && docker compose rm -fsv
1+
See [Makefile](Makefile)

‎test/docker-compose.yml

+46-23
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,31 @@ services:
1414
- mysql-router-http
1515
- mysql-router-https
1616

17+
# why using `latest` tag?
18+
# Oracle does not pin the version of mysql-server of linux/amd64 ^^
1719
mysql-server-1:
18-
env_file:
19-
- mysql-server.env
20-
image: mysql/mysql-server:${VERSION}
20+
environment:
21+
MYSQL_ROOT_PASSWORD: "mysql"
22+
MYSQL_ROOT_HOST: "%"
23+
image: container-registry.oracle.com/mysql/community-server:latest
2124
command: [ "mysqld","--server_id=1", "--binlog-transaction-dependency-tracking=WRITESET", "--binlog_checksum=NONE","--gtid_mode=ON","--enforce_gtid_consistency=ON","--log_bin","--log_slave_updates=ON","--master_info_repository=TABLE","--relay_log_info_repository=TABLE","--transaction_write_set_extraction=XXHASH64","--user=mysql","--skip-host-cache","--skip-name-resolve", "--default_authentication_plugin=mysql_native_password" ]
2225
ports:
2326
- "3301:3306"
2427

2528
mysql-server-2:
26-
env_file:
27-
- mysql-server.env
28-
image: mysql/mysql-server:${VERSION}
29+
environment:
30+
MYSQL_ROOT_PASSWORD: "mysql"
31+
MYSQL_ROOT_HOST: "%"
32+
image: container-registry.oracle.com/mysql/community-server:latest
2933
command: [ "mysqld","--server_id=2","--binlog-transaction-dependency-tracking=WRITESET", "--binlog_checksum=NONE","--gtid_mode=ON","--enforce_gtid_consistency=ON","--log_bin","--log_slave_updates=ON","--master_info_repository=TABLE","--relay_log_info_repository=TABLE","--transaction_write_set_extraction=XXHASH64","--user=mysql","--skip-host-cache","--skip-name-resolve", "--default_authentication_plugin=mysql_native_password" ]
3034
ports:
3135
- "3302:3306"
3236

3337
mysql-server-3:
34-
env_file:
35-
- mysql-server.env
36-
image: mysql/mysql-server:${VERSION}
38+
environment:
39+
MYSQL_ROOT_PASSWORD: "mysql"
40+
MYSQL_ROOT_HOST: "%"
41+
image: container-registry.oracle.com/mysql/community-server:latest
3742
command: [ "mysqld","--server_id=3","--binlog-transaction-dependency-tracking=WRITESET", "--binlog_checksum=NONE","--gtid_mode=ON","--enforce_gtid_consistency=ON","--log_bin","--log_slave_updates=ON","--master_info_repository=TABLE","--relay_log_info_repository=TABLE","--transaction_write_set_extraction=XXHASH64","--user=mysql","--skip-host-cache","--skip-name-resolve", "--default_authentication_plugin=mysql_native_password" ]
3843
ports:
3944
- "3303:3306"
@@ -42,26 +47,38 @@ services:
4247
platform: linux/amd64
4348
build:
4449
context: ./mysql-shell
50+
args:
51+
MYSQL_SHELL_PACKAGER_URL: "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-8.1.0-1.el7.x86_64.rpm"
4552
dockerfile: Dockerfile
46-
env_file:
47-
- mysql-shell.env
53+
environment:
54+
MYSQL_USER: "root"
55+
MYSQL_HOST: "mysql-server-1"
56+
MYSQL_PORT: "3306"
57+
MYSQL_PASSWORD: "mysql"
58+
MYSQLSH_SCRIPT: "/setupCluster.js"
4859
image: mysqlshell:${VERSION}
4960
depends_on:
5061
- mysql-server-1
5162
- mysql-server-2
5263
- mysql-server-3
5364

54-
#
55-
# DO NOT CHANGE APP NAME
56-
# WE WILL HAVE TO CHANGE CERTIFICATES.
57-
#
65+
#
66+
# DO NOT CHANGE APP NAME
67+
# WE WILL HAVE TO CHANGE CERTIFICATES.
68+
#
5869
mysql-router-http:
5970
platform: linux/amd64
6071
build:
6172
context: ./mysql-router
73+
args:
74+
MYSQL_YUM_REPO_URL: https://dev.mysql.com/get/mysql80-community-release-el7-8.noarch.rpm
6275
dockerfile: Dockerfile_http
63-
env_file:
64-
- mysql-router.env
76+
environment:
77+
MYSQL_USER: "root"
78+
MYSQL_HOST: "mysql-server-1"
79+
MYSQL_PORT: "3306"
80+
MYSQL_PASSWORD: mysql
81+
MYSQL_INNODB_NUM_MEMBERS: 3
6582
image: mysqlrouter-http:${VERSION}
6683
ports:
6784
- "8080:8080"
@@ -71,17 +88,23 @@ services:
7188
- mysql-server-3
7289
restart: on-failure
7390

74-
#
75-
# DO NOT CHANGE APP NAME
76-
# WE WILL HAVE TO CHANGE CERTIFICATES.
77-
#
91+
#
92+
# DO NOT CHANGE APP NAME
93+
# WE WILL HAVE TO CHANGE CERTIFICATES.
94+
#
7895
mysql-router-https:
7996
platform: linux/amd64
8097
build:
8198
context: ./mysql-router
99+
args:
100+
MYSQL_YUM_REPO_URL: https://dev.mysql.com/get/mysql80-community-release-el7-8.noarch.rpm
82101
dockerfile: Dockerfile_https
83-
env_file:
84-
- mysql-router.env
102+
environment:
103+
MYSQL_USER: "root"
104+
MYSQL_HOST: "mysql-server-1"
105+
MYSQL_PORT: "3306"
106+
MYSQL_PASSWORD: mysql
107+
MYSQL_INNODB_NUM_MEMBERS: 3
85108
image: mysqlrouter-https:${VERSION}
86109
ports:
87110
- "8443:8443"

‎test/mysql-router.env

-5
This file was deleted.

‎test/mysql-router/Dockerfile_http

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM oraclelinux:7-slim
22

3-
RUN rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022 \
4-
&& yum install -y yum install http://dev.mysql.com/get/mysql80-community-release-el7-3.noarch.rpm \
3+
ARG MYSQL_YUM_REPO_URL
4+
5+
RUN yum install -y $MYSQL_YUM_REPO_URL \
6+
&& yum-config-manager --enable mysql-innovation-community \
57
&& yum install -y mysql-community-client mysql-router-community libpwquality \
68
&& yum clean all
79

‎test/mysql-router/Dockerfile_https

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM oraclelinux:7-slim
22

3-
RUN rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022 \
4-
&& yum install -y yum install http://dev.mysql.com/get/mysql80-community-release-el7-3.noarch.rpm \
3+
ARG MYSQL_YUM_REPO_URL
4+
5+
RUN yum install -y $MYSQL_YUM_REPO_URL \
6+
&& yum-config-manager --enable mysql-innovation-community \
57
&& yum install -y mysql-community-client mysql-router-community libpwquality \
68
&& yum clean all
79

‎test/mysql-router/run_http.sh

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
set -e
33

44
if [ "$1" = 'mysqlrouter' ]; then
5+
6+
mysqlrouter --version
7+
58
if [[ -z $MYSQL_HOST || -z $MYSQL_PORT || -z $MYSQL_USER || -z $MYSQL_PASSWORD ]]; then
69
echo "We require all of"
710
echo " MYSQL_HOST"

‎test/mysql-server.env

-2
This file was deleted.

‎test/mysql-shell.env

-5
This file was deleted.

‎test/mysql-shell/Dockerfile

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
# docker buildx build --platform linux/amd64 -t mysqlshell:8.0.29 . --load
2-
31
FROM oraclelinux:7-slim
42

5-
ARG KEY=https://repo.mysql.com/RPM-GPG-KEY-mysql
6-
ARG MYSQL_SHELL_PACKAGE_URL="https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-8.0.29-1.el7.x86_64.rpm"
3+
ARG MYSQL_SHELL_PACKAGER_URL
74

85
COPY run.sh /run.sh
96
RUN chmod +x /run.sh
107

118
COPY setupCluster.js /setupCluster.js
129

13-
RUN rpmkeys --import $KEY \
14-
&& yum install -y $MYSQL_SHELL_PACKAGE_URL \
10+
RUN yum install -y $MYSQL_SHELL_PACKAGER_URL \
1511
&& yum clean all
1612

1713
ENTRYPOINT ["/run.sh"]

‎test/mysql-shell/run.sh

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -e
33

44
if [ "$1" = 'mysqlsh' ]; then
5+
mysqlsh --version
56

67
if [[ -z $MYSQL_HOST || -z $MYSQL_PORT || -z $MYSQL_USER || -z $MYSQL_PASSWORD ]]; then
78
echo "We require all of"

0 commit comments

Comments
 (0)