Skip to content

Commit 5829670

Browse files
committed
set explicit container name for test containers
1 parent c766bd0 commit 5829670

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

tests/docker/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ services:
1111
IPAM_DATABASE_NAME: "phpipam"
1212
depends_on:
1313
- database
14+
container_name: phpipam_test_webserver
1415
database:
1516
image: mariadb:10.3.18
1617
ports:
@@ -20,3 +21,4 @@ services:
2021
MYSQL_USER: "phpipam"
2122
MYSQL_PASSWORD: "phpipamadmin"
2223
MYSQL_DATABASE: "phpipam"
24+
container_name: phpipam_test_db

tests/docker/setup_database.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ done
1313
echo "Database is up"
1414

1515
echo "Creating database ${DB_NAME:-phpipam}"
16-
${DOCKER_CMD} exec -ti docker-phpipam-1 sh -c 'mysql -h database -u phpipam -pphpipamadmin phpipam < /phpipam/db/SCHEMA.sql'
16+
${DOCKER_CMD} exec -ti phpipam_test_webserver sh -c 'mysql -h database -u phpipam -pphpipamadmin phpipam < /phpipam/db/SCHEMA.sql'
1717

1818
echo "Activating API"
1919
mysql -u phpipam -pphpipamadmin -h "${DB_HOST:-127.0.0.1}" phpipam --execute="UPDATE settings SET api=1 WHERE id=1;"

0 commit comments

Comments
 (0)