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
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
php-version:
- '8.2'
- "8.4"

services:
mysql:
Expand Down Expand Up @@ -74,8 +74,8 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v6
with:
node-version-file: '.nvmrc'
cache: 'npm'
node-version-file: ".nvmrc"
cache: "npm"

- name: Install Node dependencies
run: npm ci --no-audit --ignore-scripts
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22
24
19 changes: 6 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
FROM code4romania/php:8.2 AS vendor
FROM code4romania/php:8.4 AS vendor

WORKDIR /var/www

COPY --chown=www-data:www-data . /var/www
COPY --chown=www-data:www-data . /var/www/html

RUN set -ex; \
composer install \
Expand All @@ -12,7 +10,7 @@ RUN set -ex; \
--no-dev \
--prefer-dist

FROM node:22-alpine AS assets
FROM node:24-alpine AS assets

WORKDIR /build

Expand All @@ -26,7 +24,7 @@ COPY \
RUN set -ex; \
npm ci --no-audit --ignore-scripts

COPY --from=vendor /var/www /build
COPY --from=vendor /var/www/html /build

RUN set -ex; \
npm run build
Expand All @@ -36,11 +34,6 @@ FROM vendor
ARG VERSION
ARG REVISION

RUN echo "$VERSION (${REVISION:0:7})" > /var/www/.version

COPY docker/s6-rc.d /etc/s6-overlay/s6-rc.d
COPY --from=assets --chown=www-data:www-data /build/public/build /var/www/public/build

ENV SENTRY_SAMPLE_RATE=1.0
RUN echo "$VERSION (${REVISION:0:7})" > /var/www/html/.version

EXPOSE 80
COPY --from=assets --chown=www-data:www-data /build/public/build /var/www/html/public/build
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"license": "MPL-2.0",
"require": {
"php": "^8.2",
"php": "^8.4",
"awcodes/filament-table-repeater": "^3.1",
"codeat3/blade-majestic-icons": "^2.2",
"filament/filament": "^3.3",
Expand Down
Loading
Loading