diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 14120b4e..bcba3c39 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,6 +26,9 @@ jobs: - os: ubuntu-18.04 database-version: 'mysql:5.7' php-version: '8.1' + - os: ubuntu-18.04 + database-version: 'mysql:5.7' + php-version: '8.2' - os: ubuntu-latest database-version: 'mysql:8.0' php-version: '7.4' @@ -35,6 +38,9 @@ jobs: - os: ubuntu-latest database-version: 'mysql:8.0' php-version: '8.1' + - os: ubuntu-latest + database-version: 'mysql:8.0' + php-version: '8.2' - os: ubuntu-18.04 database-version: 'mariadb:10.6' php-version: '7.4' @@ -44,6 +50,9 @@ jobs: - os: ubuntu-18.04 database-version: 'mariadb:10.6' php-version: '8.1' + - os: ubuntu-18.04 + database-version: 'mariadb:10.6' + php-version: '8.2' services: db: diff --git a/Dockerfile b/Dockerfile index 75e08f3d..b1dac9d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,9 +12,13 @@ FROM druidfi/php:8.1 as php-81 RUN sudo apk --update --no-cache add php81-pdo php81-pdo_mysql +FROM druidfi/php:8.2 as php-82 + +RUN sudo apk --update -X https://dl-cdn.alpinelinux.org/alpine/edge/community --no-cache add php82-pdo php82-pdo_mysql + FROM php-${PHP_SHORT_VERSION} -RUN sudo apk --update add --no-cache bash mysql-client \ +RUN sudo apk --update --no-cache add bash mysql-client \ && sudo rm -rf /var/cache/apk/* WORKDIR /app diff --git a/README.md b/README.md index f45a35d8..27cba71f 100644 --- a/README.md +++ b/README.md @@ -238,19 +238,22 @@ are not available in mysqldump. Local setup for tests: ``` -docker-compose up -d --build -docker-compose exec php74 /app/tests/scripts/create_users.sh -docker-compose exec php74 /app/tests/scripts/create_users.sh db2 -docker-compose exec php74 /app/tests/scripts/create_users.sh db3 -docker-compose exec -w /app/tests/scripts php74 ./test.sh -docker-compose exec -w /app/tests/scripts php80 ./test.sh -docker-compose exec -w /app/tests/scripts php81 ./test.sh -docker-compose exec -w /app/tests/scripts php74 ./test.sh db2 -docker-compose exec -w /app/tests/scripts php80 ./test.sh db2 -docker-compose exec -w /app/tests/scripts php81 ./test.sh db2 -docker-compose exec -w /app/tests/scripts php74 ./test.sh db3 -docker-compose exec -w /app/tests/scripts php80 ./test.sh db3 -docker-compose exec -w /app/tests/scripts php81 ./test.sh db3 +docker compose up -d --build +docker compose exec php81 /app/tests/scripts/create_users.sh +docker compose exec php81 /app/tests/scripts/create_users.sh db2 +docker compose exec php81 /app/tests/scripts/create_users.sh db3 +docker compose exec -w /app/tests/scripts php74 ./test.sh +docker compose exec -w /app/tests/scripts php80 ./test.sh +docker compose exec -w /app/tests/scripts php81 ./test.sh +docker compose exec -w /app/tests/scripts php82 ./test.sh +docker compose exec -w /app/tests/scripts php74 ./test.sh db2 +docker compose exec -w /app/tests/scripts php80 ./test.sh db2 +docker compose exec -w /app/tests/scripts php81 ./test.sh db2 +docker compose exec -w /app/tests/scripts php82 ./test.sh db2 +docker compose exec -w /app/tests/scripts php74 ./test.sh db3 +docker compose exec -w /app/tests/scripts php80 ./test.sh db3 +docker compose exec -w /app/tests/scripts php81 ./test.sh db3 +docker compose exec -w /app/tests/scripts php82 ./test.sh db3 ``` ## Credits diff --git a/docker-compose.yml b/docker-compose.yml index 589cbb88..30a4f1ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,3 +61,17 @@ services: - db - db2 - db3 + + php82: + container_name: "mysqldump-php-82" + image: mysqldump-php-tester:php-8.2 + build: + context: . + args: + PHP_SHORT_VERSION: "82" + volumes: + - .:/app + depends_on: + - db + - db2 + - db3