Skip to content

Unpin MariaDB and remove deprecated / removed settings from config #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2020
Merged

Unpin MariaDB and remove deprecated / removed settings from config #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions runner/master/mysql.d/master/conf.d/master.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
default-character-set = utf8mb4

[mysqld]
innodb_file_format = Barracuda
innodb_file_per_table = 1
innodb_large_prefix = On

character-set-server = utf8mb4
collation-server = utf8mb4_bin
Expand Down
2 changes: 0 additions & 2 deletions runner/master/mysql.d/slave/config/moodle.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
default-character-set = utf8mb4

[mysqld]
innodb_file_format = Barracuda
innodb_file_per_table = 1
innodb_large_prefix = On

character-set-server = utf8mb4
collation-server = utf8mb4_bin
Expand Down
2 changes: 0 additions & 2 deletions runner/master/mysql.d/standalone/conf.d/moodle.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
default-character-set = utf8mb4

[mysqld]
innodb_file_format = Barracuda
innodb_file_per_table = 1
innodb_large_prefix = On

character-set-server = utf8mb4
collation-server = utf8mb4_bin
Expand Down
6 changes: 3 additions & 3 deletions runner/master/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ then
--tmpfs /var/lib/mysql:rw \
-v $SCRIPTPATH/mysql.d/master/conf.d:/etc/mysql/conf.d \
-v $SCRIPTPATH/mysql.d/master/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d \
mariadb:10.2
mariadb

echo "Starting slave"
docker run \
Expand All @@ -340,7 +340,7 @@ then
-v $SCRIPTPATH/mysql.d/slave/config:/config \
-v $SCRIPTPATH/mysql.d/slave/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d \
--tmpfs /var/lib/mysql:rw \
mariadb:10.2
mariadb

# Hack to make gosu work for all users on the slave.
docker exec -u root $DBHOST_SLAVE bash -c 'chown root:mysql /usr/local/bin/gosu'
Expand All @@ -357,7 +357,7 @@ then
-e MYSQL_PASSWORD="${DBPASS}" \
--tmpfs /var/lib/mysql:rw \
-v $SCRIPTPATH/mysql.d/standalone/conf.d:/etc/mysql/conf.d \
mariadb:10.2
mariadb
fi

export DBCOLLATION=utf8mb4_bin
Expand Down