Skip to content

Commit 259925c

Browse files
committed
Fix test tool chain
* make tool chain work with podman too * update db setup script to work with podman * set predictable container names * fix fissues with starting docker-compose in CI * upgrade `docker-compose` before run phpipam-action * pin python to version 3.9 as long we did not found time to test newer versions run stale workflow on hosted runners
1 parent de85c6d commit 259925c

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.github/workflows/main.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ jobs:
1010
matrix:
1111
phpipam-version: ['v1.4x', 'v1.5x']
1212
steps:
13+
- name: Upgrade docker-compose
14+
run: sudo apt-get install --upgrade docker-compose
1315
- uses: actions/checkout@v3
1416
- name: setup phpipam
1517
uses: codeaffen/phpipam-action@v2
@@ -18,7 +20,7 @@ jobs:
1820
- name: Set up Python
1921
uses: actions/setup-python@v3
2022
with:
21-
python-version: '3.x'
23+
python-version: '3.9'
2224
- name: setup test environment
2325
run: |
2426
make test-setup

.github/workflows/stale.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ permissions:
1515

1616
jobs:
1717
stale:
18-
# runs-on: ubuntu-latest
19-
runs-on: [self-hosted]
18+
runs-on: ubuntu-latest
19+
# runs-on: [self-hosted]
2020
steps:
2121
- uses: actions/stale@v8
2222
with:

tests/docker/docker-compose.yml

+2
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
if grep -q podman <<< $(docker --version 2> /dev/null) ; then
3+
if grep -iq podman <<< $(docker version 2> /dev/null) ; then
44
echo "Podman is installed"
55
DOCKER_CMD=$(which podman)
66
fi
@@ -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)