Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
php-version:
- '8.4'
- '8.5'
- '8.6'

steps:
- name: Checkout
Expand All @@ -40,7 +41,7 @@ jobs:
run: docker compose pull --quiet

- name: Build
run: docker compose build --build-arg PHPVERSION=${{ matrix.php-version }}
run: docker compose build --build-arg PHPVERSION=${{ matrix.php-version == '8.6' && '8.6.0RC4' || matrix.php-version }}

- name: Lint
if: matrix.php-version == '8.4'
Expand Down
21 changes: 18 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
ARG PHPVERSION="8.4"
FROM php:$PHPVERSION-cli-alpine

ARG PHPVERSION

RUN apk --update --no-cache add \
libpq \
mysql-client \
postgresql-client \
postgresql-dev \
oniguruma-dev \
&& rm -rf /tmp/* /var/cache/apk/*

RUN docker-php-ext-install \
mbstring \
pdo_mysql \
pdo_pgsql

RUN apk add --no-cache \
$PHPIZE_DEPS \
linux-headers \
&& pecl install xdebug-3.5.1 \
&& docker-php-ext-enable xdebug \
libtool \
curl \
git \
&& curl -fsSL \
https://github.com/php/pie/releases/latest/download/pie.phar \
-o /usr/local/bin/pie \
&& chmod +x /usr/local/bin/pie \
&& case "$PHPVERSION" in \
8.6*) pie install "xdebug/xdebug:3.6.0alpha1@alpha" ;; \
*) pie install "xdebug/xdebug:3.5.3" ;; \
esac \
&& php -v \
&& rm -rf /tmp/* /var/cache/apk/*

RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer
Expand All @@ -25,8 +39,9 @@ WORKDIR /app

COPY composer.json .
COPY composer.lock .
RUN composer validate
RUN composer validate --strict --no-check-all
RUN composer install --no-interaction --no-progress
RUN composer audit --no-interaction

COPY . .

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
}
},
"require": {
"php": ">=8.4.0",
"rancoud/database": "7.0.3",
"php": "^8.4.27 || ^8.5.12 || ^8.6.0",
"rancoud/database": "7.0.4",
"ext-json": "*",
"ext-mbstring": "*",
"ext-pdo": "*"
Expand All @@ -45,7 +45,7 @@
"php-cs-fixer fix -vvv"
],
"test": [
"phpunit --colors --display-all-issues --coverage-html ./coverage --coverage-clover coverage/clover.xml --coverage-text"
"phpunit --colors --display-all-issues --coverage-html ./coverage --coverage-text"
]
}
}
Loading