Merge branch 'master' into next
This commit is contained in:
commit
ed99cf3f3c
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -5,6 +5,7 @@ on:
|
||||
branches-ignore:
|
||||
- next
|
||||
paths-ignore:
|
||||
- examples
|
||||
- Dockerfile.template
|
||||
- LICENSE
|
||||
- README.md
|
||||
@ -12,6 +13,7 @@ on:
|
||||
branches-ignore:
|
||||
- next
|
||||
paths-ignore:
|
||||
- examples
|
||||
- Dockerfile.template
|
||||
- LICENSE
|
||||
- README.md
|
||||
|
11
examples/compose-debug.yml
Normal file
11
examples/compose-debug.yml
Normal file
@ -0,0 +1,11 @@
|
||||
services:
|
||||
mariadb:
|
||||
image: quay.io/mariadb-foundation/mariadb-debug:11.2
|
||||
volumes:
|
||||
- mariadbdata:/var/lib/mysql
|
||||
environment:
|
||||
- MARIADB_ROOT_PASSWORD=bob
|
||||
command: gdb -ex r -ex 'thread apply all bt -frame-arguments all full' --args mariadbd
|
||||
user: mysql
|
||||
volumes:
|
||||
mariadbdata: {}
|
34
examples/compose-replication.yml
Normal file
34
examples/compose-replication.yml
Normal file
@ -0,0 +1,34 @@
|
||||
version: "3"
|
||||
services:
|
||||
master:
|
||||
image: mariadb:latest
|
||||
command: --log-bin --log-basename=mariadb
|
||||
environment:
|
||||
- MARIADB_ROOT_PASSWORD=password
|
||||
- MARIADB_USER=testuser
|
||||
- MARIADB_PASSWORD=password
|
||||
- MARIADB_DATABASE=testdb
|
||||
- MARIADB_REPLICATION_USER=repl
|
||||
- MARIADB_REPLICATION_PASSWORD=replicationpass
|
||||
healthcheck:
|
||||
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
replica:
|
||||
image: mariadb:latest
|
||||
command: --server-id=2 --log-basename=mariadb
|
||||
environment:
|
||||
- MARIADB_ROOT_PASSWORD=password
|
||||
- MARIADB_MASTER_HOST=master
|
||||
- MARIADB_REPLICATION_USER=repl
|
||||
- MARIADB_REPLICATION_PASSWORD=replicationpass
|
||||
- MARIADB_HEALTHCHECK_GRANTS=REPLICA MONITOR
|
||||
healthcheck:
|
||||
test: ["CMD", "healthcheck.sh", "--connect", "--replication_io", "--replication_sql", "--replication_seconds_behind_master=1", "--replication"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
depends_on:
|
||||
master:
|
||||
condition: service_healthy
|
@ -25,7 +25,7 @@ command -v bashbrew >/dev/null || {
|
||||
|
||||
source '.architectures-lib'
|
||||
|
||||
GLOBIGNORE=.*/:test/:11.3/
|
||||
GLOBIGNORE=examples/:.*/:test/:11.3/
|
||||
versions=( */ )
|
||||
versions=( "${versions[@]%/}" )
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user