Skip to content

Commit 0adfb72

Browse files
authored
Bugfix: fix local test environment (#55)
* switch to podman if available * make version and port variable
1 parent b017f38 commit 0adfb72

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

tests/docker/docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
version: '3'
22
services:
33
phpipam:
4-
image: phpipam/phpipam-www:v1.4.4
4+
image: "phpipam/phpipam-www:v${PHPIPAM_VERSION:-1.4.4}"
55
ports:
6-
- "443:443"
6+
- "${PHPIPAM_PORT:-443}:443"
77
environment:
88
IPAM_DATABASE_HOST: "database"
99
IPAM_DATABASE_USER: "phpipam"

tests/docker/setup_database.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#!/bin/bash
22

3+
if grep -q podman <<< $(docker --version 2> /dev/null) ; then
4+
echo "Podman is installed"
5+
DOCKER_CMD=$(which podman)
6+
fi
7+
38
while ! nc -z "${DB_HOST:-127.0.0.1}" "${DB_PORT:-3306}"; do
49
echo "Waiting for database connection..."
510
sleep 1
@@ -8,10 +13,13 @@ done
813
echo "Database is up"
914

1015
echo "Creating database ${DB_NAME:-phpipam}"
11-
docker exec -ti docker_phpipam_1 sh -c 'mysql -h database -u phpipam -pphpipamadmin phpipam < /phpipam/db/SCHEMA.sql'
16+
${DOCKER_CMD} exec -ti docker_phpipam_1 sh -c 'mysql -h database -u phpipam -pphpipamadmin phpipam < /phpipam/db/SCHEMA.sql'
1217

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

1621
echo "Inserting API application"
1722
mysql -u phpipam -pphpipamadmin -h "${DB_HOST:-127.0.0.1}" phpipam --execute="INSERT INTO api (app_id, app_code, app_permissions, app_security, app_lock_wait) VALUES ('ansible','aAbBcCdDeEfF00112233445566778899',2,'ssl_token',0);"
23+
24+
echo "Disable forced password reset"
25+
mysql -u phpipam -pphpipamadmin -h "${DB_HOST:-127.0.0.1}" phpipam --execute="UPDATE users SET passChange = 'No' WHERE username = 'Admin';"

0 commit comments

Comments
 (0)