Skip to content

Commit c9bbfae

Browse files
cytopiacytopia
committed
Adjust tests to platform arch
1 parent 438595b commit c9bbfae

6 files changed

Lines changed: 42 additions & 34 deletions

File tree

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@ ifeq ($(strip $(VERSION)),)
9999
@$(error Exiting)
100100
endif
101101
@echo "################################################################################"
102-
@echo "# Testing $(IMAGE):$(NAME)-$(VERSION) $(ARCH)"
102+
@echo "# Testing $(IMAGE):$(DOCKER_TAG) $(ARCH)"
103103
@echo "################################################################################"
104-
./tests/tests.sh "$(NAME)" "$(VERSION)" "$(ARCH)"
104+
./tests/tests.sh "$(NAME)" "$(VERSION)" "${DOCKER_TAG}" "$(ARCH)"

‎tests/00-entrypoint.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ set -u
44
set -o pipefail
55

66
IMAGE="devilbox/mysql"
7-
TYPE="${1}"
8-
VERSION="${2}"
7+
#NAME="${1}"
8+
#VERSION="${2}"
9+
TAG="${3}"
10+
#ARCH="${4}"
911

1012

1113
# Ensure they all have a common entrypoint
12-
if ! docker image inspect "${IMAGE}:${TYPE}-${VERSION}" \
14+
if ! docker image inspect "${IMAGE}:${TAG}" \
1315
| grep '"Entrypoint":' -A 1 \
1416
| grep -E '"/?docker-entrypoint.sh"'; then
15-
docker image inspect "${IMAGE}:${TYPE}-${VERSION}" | grep -i "entrypoint" || true
17+
docker image inspect "${IMAGE}:${TAG}" | grep -i "entrypoint" || true
1618
exit 1
1719
fi

‎tests/01-version.sh‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ set -u
44
set -o pipefail
55

66
IMAGE="devilbox/mysql"
7-
TYPE="${1}"
7+
NAME="${1}"
88
VERSION="${2}"
9-
ARCH="${3}"
9+
TAG="${3}"
10+
ARCH="${4}"
1011

1112

12-
if [ "${TYPE}" = "mysql" ]; then
13-
docker run --rm --platform "${ARCH}" $(tty -s && echo "-it" || echo) "${IMAGE}:${TYPE}-${VERSION}" -V | grep 'MySQL' | grep "${VERSION/./\\.}"
14-
elif [ "${TYPE}" = "mariadb" ]; then
15-
docker run --rm --platform "${ARCH}" $(tty -s && echo "-it" || echo) "${IMAGE}:${TYPE}-${VERSION}" -V | grep 'MariaDB' | grep "${VERSION/./\\.}"
16-
elif [ "${TYPE}" = "percona" ]; then
17-
docker run --rm --platform "${ARCH}" $(tty -s && echo "-it" || echo) "${IMAGE}:${TYPE}-${VERSION}" -V | grep 'Percona' | grep "${VERSION/./\\.}"
13+
if [ "${NAME}" = "mysql" ]; then
14+
docker run --rm --platform "${ARCH}" "$(tty -s && echo "-it" || echo)" "${IMAGE}:${TAG}" -V | grep 'MySQL' | grep "${VERSION/./\\.}"
15+
elif [ "${NAME}" = "mariadb" ]; then
16+
docker run --rm --platform "${ARCH}" "$(tty -s && echo "-it" || echo)" "${IMAGE}:${TAG}" -V | grep 'MariaDB' | grep "${VERSION/./\\.}"
17+
elif [ "${NAME}" = "percona" ]; then
18+
docker run --rm --platform "${ARCH}" "$(tty -s && echo "-it" || echo)" "${IMAGE}:${TAG}" -V | grep 'Percona' | grep "${VERSION/./\\.}"
1819
else
19-
>&2 echo "[ERROR] Wrong type: ${TYPE}"
20+
>&2 echo "[ERROR] Wrong type: ${NAME}"
2021
exit 1
2122
fi

‎tests/02-mysqli.sh‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ set -u
44
set -o pipefail
55

66
IMAGE="devilbox/mysql"
7-
TYPE="${1}"
8-
VERSION="${2}"
9-
ARCH="${3}"
7+
#NAME="${1}"
8+
#VERSION="${2}"
9+
TAG="${3}"
10+
ARCH="${4}"
1011
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
1112

1213

@@ -15,12 +16,12 @@ echo "1/5 Starting MySQL"
1516
docker run \
1617
-d \
1718
--platform "${ARCH}" \
18-
$(tty -s && echo "-it" || echo) \
19+
"$(tty -s && echo "-it" || echo)" \
1920
--rm \
2021
--hostname=mysql \
2122
--name devilbox-test-mysql \
2223
-e MYSQL_ALLOW_EMPTY_PASSWORD=yes \
23-
"${IMAGE}:${TYPE}-${VERSION}"
24+
"${IMAGE}:${TAG}"
2425

2526
# Pull PHP image
2627
echo "2/5 Pulling PHP image "
@@ -33,7 +34,7 @@ echo "3/5 Starting PHP"
3334
docker run \
3435
-d \
3536
--platform "${ARCH}" \
36-
$(tty -s && echo "-it" || echo) \
37+
"$(tty -s && echo "-it" || echo)" \
3738
--rm \
3839
--hostname=php \
3940
--name devilbox-test-php \
@@ -42,7 +43,7 @@ docker run \
4243

4344
# Install PHP mysqli module
4445
echo "4/5 Installing mysqli extension"
45-
if ! docker exec $(tty -s && echo "-it" || echo) devilbox-test-php sh -c 'docker-php-ext-install mysqli'; then
46+
if ! docker exec "$(tty -s && echo "-it" || echo)" devilbox-test-php sh -c 'docker-php-ext-install mysqli'; then
4647
docker logs devilbox-test-php 2>/dev/null || true
4748
docker logs devilbox-test-mysql 2>/dev/null || true
4849
docker stop devilbox-test-php 2>/dev/null || true
@@ -58,14 +59,14 @@ fi
5859
max=100
5960
i=0
6061
printf "5/5 Testing mysqli extension "
61-
while ! docker exec $(tty -s && echo "-it" || echo) devilbox-test-php php /tmp/mysql.php >/dev/null 2>&1; do
62+
while ! docker exec "$(tty -s && echo "-it" || echo)" devilbox-test-php php /tmp/mysql.php >/dev/null 2>&1; do
6263
printf "."
6364
sleep 1
6465
i=$(( i + 1))
6566
if [ "${i}" -ge "${max}" ]; then
6667
printf "\\n"
6768
>&2 echo "Failed"
68-
docker exec $(tty -s && echo "-it" || echo) devilbox-test-php php /tmp/mysql.php || true
69+
docker exec "$(tty -s && echo "-it" || echo)" devilbox-test-php php /tmp/mysql.php || true
6970
docker logs devilbox-test-php 2>/dev/null || true
7071
docker logs devilbox-test-mysql 2>/dev/null || true
7172
docker stop devilbox-test-php 2>/dev/null || true

‎tests/03-config.sh‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ set -u
44
set -o pipefail
55

66
IMAGE="devilbox/mysql"
7-
TYPE="${1}"
8-
VERSION="${2}"
9-
ARCH="${3}"
7+
IMAGE="devilbox/mysql"
8+
#NAME="${1}"
9+
#VERSION="${2}"
10+
TAG="${3}"
11+
ARCH="${4}"
1012

1113

1214
# Custom MySQL configuration
@@ -21,18 +23,18 @@ echo "${CNF_KEY} = ${CNF_VAL}" >> "${CNF_DIR}/config.cnf"
2123
docker run \
2224
-d \
2325
--platform "${ARCH}" \
24-
$(tty -s && echo "-it" || echo) \
26+
"$(tty -s && echo "-it" || echo)" \
2527
--rm \
2628
--hostname=mysql \
2729
--name devilbox-test-mysql \
2830
-e MYSQL_ALLOW_EMPTY_PASSWORD=yes \
29-
-v ${CNF_DIR}:/etc/mysql/docker-default.d \
30-
"${IMAGE}:${TYPE}-${VERSION}"
31+
-v "${CNF_DIR}:/etc/mysql/docker-default.d" \
32+
"${IMAGE}:${TAG}"
3133

3234
# Test MySQL connectivity
3335
max=100
3436
i=0
35-
while ! docker exec $(tty -s && echo "-it" || echo) devilbox-test-mysql mysql -uroot --password="" -h 127.0.0.1 -e "SHOW VARIABLES LIKE '%${CNF_KEY}%';" | grep "${CNF_VAL}"; do
37+
while ! docker exec "$(tty -s && echo "-it" || echo)" devilbox-test-mysql mysql -uroot --password="" -h 127.0.0.1 -e "SHOW VARIABLES LIKE '%${CNF_KEY}%';" | grep "${CNF_VAL}"; do
3638
sleep 1
3739
i=$(( i + 1))
3840
if [ "${i}" -ge "${max}" ]; then

‎tests/tests.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ set -e
44
set -u
55
set -o pipefail
66

7-
TYPE="${1}"
7+
NAME="${1}"
88
VERSION="${2}"
9-
ARCH="${3}"
9+
TAG="${3}"
10+
ARCH="${4}"
11+
1012
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
1113

1214
for f in $( find "${SCRIPTPATH}" -name \*.sh | grep -E '[0-9]+' | sort -u ); do
1315
echo "# --------------------------------------------------------------------------------------------------"
1416
echo "# $( basename "${f}" )"
1517
echo "# --------------------------------------------------------------------------------------------------"
16-
if ! ${f} "${TYPE}" "${VERSION}" "${ARCH}"; then
18+
if ! ${f} "${NAME}" "${VERSION}" "${TAG}" "${ARCH}"; then
1719
exit 1
1820
fi
1921
echo

0 commit comments

Comments
 (0)