diff --git a/docker/images/mysql/mysql-empty/Dockerfile b/docker/images/mysql/mysql-empty/Dockerfile new file mode 100644 index 000000000..ce7abf543 --- /dev/null +++ b/docker/images/mysql/mysql-empty/Dockerfile @@ -0,0 +1,6 @@ +# The only purpose for which this image exists is to add ProxySQL-relevant +# labels to it. +FROM mysql:latest + +LABEL vendor=proxysql\ + com.proxysql.type=mysql \ No newline at end of file diff --git a/docker/images/mysql/mysql-simple-dump-replication/Dockerfile b/docker/images/mysql/mysql-simple-dump-replication/Dockerfile deleted file mode 100644 index 6c61b2410..000000000 --- a/docker/images/mysql/mysql-simple-dump-replication/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -# We are creating a custom Dockerfile for MySQL as there is no easy way to -# move a file from host into the container. In our case, it's schema.sql -# There is a proposed improvement to "docker cp" but it's still being -# discussed (https://github.com/docker/docker/issues/5846). -FROM mysql:latest - -LABEL vendor=proxysql\ - com.proxysql.type=mysql - -ADD ./schema.sql /tmp/ -ADD ./import_schema.sh /tmp/ -ADD ./my.cnf /tmp/ \ No newline at end of file diff --git a/docker/images/mysql/mysql-simple-dump-replication/conf.d/my.cnf b/docker/images/mysql/mysql-simple-dump-replication/conf.d/my.cnf deleted file mode 100644 index c4f4dcdea..000000000 --- a/docker/images/mysql/mysql-simple-dump-replication/conf.d/my.cnf +++ /dev/null @@ -1,18 +0,0 @@ -[mysqld] -innodb_file_per_table -innodb_flush_log_at_trx_commit=2 -query_cache_size = 0 -sync_binlog = 0 -log_bin -binlog_format = MIXED -gtid_mode = ON -log-slave-updates -enforce-gtid-consistency -expire_logs_days = 3 -max_binlog_size = 100M -bind_address = 0.0.0.0 -max_connections = 5000 -skip_name_resolve - -[mysqld_safe] -open_files_limit = 102400 \ No newline at end of file diff --git a/docker/images/mysql/mysql-simple-dump-replication/import_schema.sh b/docker/images/mysql/mysql-simple-dump-replication/import_schema.sh deleted file mode 100644 index f242a1b44..000000000 --- a/docker/images/mysql/mysql-simple-dump-replication/import_schema.sh +++ /dev/null @@ -1,2 +0,0 @@ -cat /tmp/schema.sql | mysql -h 127.0.0.1 -u root -proot -cat /tmp/my.cnf | sed -e "s/XXXX/$MYSQL_SERVER_ID/" > /etc/mysql/conf.d/my.cnf \ No newline at end of file diff --git a/docker/images/mysql/mysql-simple-dump-replication/schema.sql b/docker/images/mysql/mysql-simple-dump-replication/schema.sql deleted file mode 100644 index 655565f12..000000000 --- a/docker/images/mysql/mysql-simple-dump-replication/schema.sql +++ /dev/null @@ -1,21 +0,0 @@ -DROP DATABASE IF EXISTS test; -CREATE DATABASE test; - -# Used by monitoring module for connection health -CREATE USER monitor@'%' IDENTIFIED BY 'monitor'; -CREATE USER john@'%' IDENTIFIED BY 'doe'; -CREATE USER danny@'%' IDENTIFIED BY 'white'; - -GRANT ALL PRIVILEGES ON test.* TO 'monitor'@'%'; -GRANT ALL PRIVILEGES ON test.* TO 'john'@'%'; -GRANT ALL PRIVILEGES ON test.* TO 'danny'@'%'; -FLUSH PRIVILEGES; - -USE test; - -CREATE TABLE strings(value LONGTEXT); - -INSERT INTO strings(value) VALUES('a'); -INSERT INTO strings(value) VALUES('ab'); -INSERT INTO strings(value) VALUES('abc'); -INSERT INTO strings(value) VALUES('abcd'); \ No newline at end of file diff --git a/docker/scenarios/5backends-replication/docker-compose.yml b/docker/scenarios/5backends-replication/docker-compose.yml index d90369f6e..3a446dec9 100644 --- a/docker/scenarios/5backends-replication/docker-compose.yml +++ b/docker/scenarios/5backends-replication/docker-compose.yml @@ -29,7 +29,7 @@ proxysql: "vendor": "proxysql" backend1hostgroup0: - image: proxysql:mysql-simple-dump-replication + image: proxysql:mysql-simple-dump environment: MYSQL_ROOT_PASSWORD: root expose: @@ -46,7 +46,7 @@ backend1hostgroup0: - ./master-conf.d:/etc/mysql/conf.d backend1hostgroup1: - image: proxysql:mysql-simple-dump-replication + image: proxysql:mysql-empty environment: MYSQL_ROOT_PASSWORD: root links: @@ -65,7 +65,7 @@ backend1hostgroup1: - ./slave1-conf.d:/etc/mysql/conf.d backend2hostgroup1: - image: proxysql:mysql-simple-dump-replication + image: proxysql:mysql-empty environment: MYSQL_ROOT_PASSWORD: root links: @@ -84,7 +84,7 @@ backend2hostgroup1: - ./slave2-conf.d:/etc/mysql/conf.d backend3hostgroup1: - image: proxysql:mysql-simple-dump-replication + image: proxysql:mysql-empty environment: MYSQL_ROOT_PASSWORD: root links: @@ -103,7 +103,7 @@ backend3hostgroup1: - ./slave3-conf.d:/etc/mysql/conf.d backend4hostgroup1: - image: proxysql:mysql-simple-dump-replication + image: proxysql:mysql-empty environment: MYSQL_ROOT_PASSWORD: root links: