Skip to content

Commit 4c00bf0

Browse files
committed
Make target mariadb/mysql version configurable
1 parent e5337fb commit 4c00bf0

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

tests/config.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ TEST_NAME='mariadb-toolbox'
22
TEST_IMAGE="panubo/$TEST_NAME"
33
TEST_TAG='test'
44
TEST_CONTAINER="${TEST_IMAGE}:${TEST_TAG}"
5+
MARIADB_IMAGE='mariadb'
6+
MARIADB_TAG='latest'

tests/test.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ CWD="$(dirname $0)/"
99
. ${CWD}functions.sh
1010

1111
echo "=> Test backup command"
12-
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
12+
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
1313
docker run -t -i --name $TEST_NAME --link mariadb -e BACKUP_DIR=/backup $TEST_CONTAINER backup
1414
cleanup mariadb $TEST_NAME
1515

1616
echo "=> Test check command"
17-
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
17+
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
1818
docker run -t -i --name $TEST_NAME --link mariadb $TEST_CONTAINER check
1919
cleanup mariadb $TEST_NAME
2020

2121
echo "=> Test copy-database command"
22-
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
22+
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
2323
docker run -t -i --name $TEST_NAME --link mariadb -e BACKUP_DIR=/backup -v /tmp/data:/data $TEST_CONTAINER copy-database mysql mysql-backup
2424
cleanup mariadb $TEST_NAME
2525

2626
echo "=> Test convert-to-innodb command"
27-
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
27+
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
2828
(
2929
echo "CREATE DATABASE foodb;"
3030
echo "USE foodb; CREATE TABLE testtable (a INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (a)) ENGINE=MyISAM;"
@@ -33,7 +33,7 @@ docker run -t -i --name $TEST_NAME --link mariadb -e BACKUP_DIR=/backup $TEST_CO
3333
cleanup mariadb $TEST_NAME
3434

3535
echo "=> Test create-user-db command"
36-
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
36+
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
3737
docker run -t -i --name $TEST_NAME --link mariadb -e BACKUP_DIR=/backup $TEST_CONTAINER create-user-db foo foopass
3838
cleanup mariadb $TEST_NAME
3939

@@ -42,15 +42,15 @@ mkdir -p /tmp/data
4242
(
4343
echo "CREATE TABLE testtable (a INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (a)) ENGINE=MyISAM;"
4444
) | gzip > /tmp/data/foodb.sql.gz
45-
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
45+
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
4646
docker run -t -i --name $TEST_NAME --link mariadb -e DATA_SRC=/data -v /tmp/data:/data $TEST_CONTAINER import
4747
cleanup mariadb $TEST_NAME
4848

4949
echo "=> Test load command"
5050
echo "TODO"
5151

5252
echo "=> Test mysql command"
53-
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password mariadb:latest > /dev/null
53+
docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
5454
echo "SHOW DATABASES;" | docker run -i --name $TEST_NAME --link mariadb $TEST_CONTAINER mysql
5555
cleanup mariadb $TEST_NAME
5656

0 commit comments

Comments
 (0)