Skip to content

Commit 30eb78e

Browse files
committed
fix(ci): address obsolete docker-compose version and incorrect Firebird image name
1 parent 2d8e0c3 commit 30eb78e

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
FROM php:8.1-apache
2-
RUN docker-php-ext-install pdo_firebird && a2enmod rewrite
2+
RUN apt-get update && apt-get install -y firebird-dev && \
3+
docker-php-ext-install pdo_firebird && a2enmod rewrite

.github/workflows/playwright.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ jobs:
2626
- name: Configure application for testing
2727
run: |
2828
cp inc/configuration.inc.php inc/configuration.inc.php.bak
29-
sed -i "s/define('DB_USER', 'SYSDBA');/define('DB_USER', 'SYSDBA');/" inc/configuration.inc.php
30-
sed -i "s/define('DB_PASS', '');/define('DB_PASS', 'test');/" inc/configuration.inc.php
31-
sed -i "s/define('DB_HOST', 'localhost');/define('DB_HOST', 'firebird');/" inc/configuration.inc.php
32-
sed -i "s|define('DB_PATH', '/var/lib/firebird/3.0/data/employee.fdb');|define('DB_PATH', 'test.fdb');|" inc/configuration.inc.php
29+
sed -i "s/define('DEFAULT_HOST', 'localhost');/define('DEFAULT_HOST', 'firebird');/" inc/configuration.inc.php
30+
sed -i "s/define('DEFAULT_DB', 'employee.fdb');/define('DEFAULT_DB', 'test.fdb');/" inc/configuration.inc.php
31+
sed -i "s|define('DEFAULT_PATH', '/var/lib/firebird/2.5/data/');|define('DEFAULT_PATH', '/firebird/data/');|" inc/configuration.inc.php
3332
3433
- name: Start services
3534
run: docker compose up -d
@@ -43,8 +42,8 @@ jobs:
4342
max_wait=300
4443
current_wait=0
4544
while [ $current_wait -lt $max_wait ]; do
46-
if [ "$(docker-compose ps -q web | xargs docker inspect -f '{{.State.Health.Status}}')" = "healthy" ] &&
47-
[ "$(docker-compose ps -q firebird | xargs docker inspect -f '{{.State.Health.Status}}')" = "healthy" ]; then
45+
if [ "$(docker compose ps -q web | xargs docker inspect -f '{{.State.Health.Status}}')" = "healthy" ] &&
46+
[ "$(docker compose ps -q firebird | xargs docker inspect -f '{{.State.Health.Status}}')" = "healthy" ]; then
4847
echo "Services are healthy!"
4948
docker compose logs
5049
exit 0

docker-compose.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
version: '3.8'
21
services:
32
firebird:
4-
image: firebird/firebird:3.0
3+
image: firebirdsql/firebird:3.0
54
ports:
65
- "3050:3050"
76
environment:
87
FIREBIRD_PASSWORD: test
9-
FIREBIRD_DB: test.fdb
8+
FIREBIRD_DATABASE: test.fdb
109
healthcheck:
1110
test: ["CMD", "gbak", "-user", "sysdba", "-password", "test", "localhost:/firebird/data/test.fdb", "/dev/null"]
1211
interval: 10s

0 commit comments

Comments
 (0)