Skip to content

Commit a461f33

Browse files
committed
chore: update dependencies
1 parent 5683735 commit a461f33

File tree

24 files changed

+4330
-3712
lines changed

24 files changed

+4330
-3712
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ updates:
1212
schedule:
1313
interval: "monthly"
1414
versioning-strategy: increase
15-
# This option has no impact on security updates, which have a separate,
16-
# internal limit of ten open pull requests.
17-
open-pull-requests-limit: 0
15+
open-pull-requests-limit: 20
16+
rebase-strategy: "disabled"
1817

1918
# Maintain dependencies for npm
2019
- package-ecosystem: "npm"
2120
directory: "/"
2221
schedule:
2322
interval: "monthly"
2423
versioning-strategy: increase
25-
# This option has no impact on security updates, which have a separate,
26-
# internal limit of ten open pull requests.
27-
open-pull-requests-limit: 0
24+
open-pull-requests-limit: 20
25+
rebase-strategy: "disabled"

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
24

Dockerfile

Lines changed: 33 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,31 @@
1-
FROM php:8.2-fpm-alpine AS vendor
1+
FROM code4romania/php:8.4 AS vendor
22

3-
ENV COMPOSER_ALLOW_SUPERUSER 1
4-
ENV COMPOSER_HOME /tmp
5-
ENV COMPOSER_CACHE_DIR /dev/null
3+
# Switch to root so we can do root things
4+
USER root
65

7-
WORKDIR /var/www
8-
9-
COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
6+
# Install additional PHP extensions
7+
RUN set -ex; \
8+
install-php-extensions \
9+
imagick
1010

11-
RUN apk update && \
12-
#
13-
# production dependencies
11+
RUN set -ex; \
1412
apk add --no-cache \
15-
ffmpeg \
16-
nginx && \
17-
#
18-
# install extensions
19-
install-php-extensions \
20-
event \
21-
excimer \
22-
exif \
23-
gd \
24-
imagick \
25-
intl \
26-
mbstring \
27-
opcache \
28-
pdo_mysql \
29-
pcntl \
30-
zip
31-
32-
COPY --chown=www-data:www-data . /var/www
33-
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
34-
35-
RUN composer install \
13+
ffmpeg
14+
15+
# Drop back to our unprivileged user
16+
USER www-data
17+
18+
COPY --chown=www-data:www-data . /var/www/html
19+
20+
RUN set -ex; \
21+
composer install \
3622
--optimize-autoloader \
3723
--no-interaction \
3824
--no-plugins \
3925
--no-dev \
4026
--prefer-dist
4127

42-
FROM node:20-alpine AS assets
28+
FROM node:24-alpine AS assets
4329

4430
WORKDIR /build
4531

@@ -50,55 +36,36 @@ COPY \
5036
vite.config.js \
5137
./
5238

53-
RUN npm ci --no-audit --ignore-scripts
39+
RUN set -ex; \
40+
npm ci --no-audit --ignore-scripts
5441

55-
COPY --from=vendor /var/www /build
42+
COPY --from=vendor /var/www/html /build
5643

57-
RUN npm run build
44+
RUN set -ex; \
45+
npm run build
5846

5947
FROM vendor
6048

61-
ARG S6_OVERLAY_VERSION=3.1.6.2
49+
ARG VERSION
50+
ARG REVISION
6251

63-
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
64-
RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
65-
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
66-
RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
52+
RUN echo "$VERSION (${REVISION:0:7})" > /var/www/.version
6753

68-
ENTRYPOINT ["/init"]
54+
COPY --from=assets --chown=www-data:www-data /build/public/build /var/www/html/public/build
6955

70-
COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
71-
COPY docker/php/php.ini /usr/local/etc/php/php.ini
72-
COPY docker/php/www.conf /usr/local/etc/php-fpm.d/zz-docker.conf
73-
COPY docker/s6-rc.d /etc/s6-overlay/s6-rc.d
74-
75-
COPY --from=assets --chown=www-data:www-data /build/public/build /var/www/public/build
76-
77-
ENV APP_ENV production
78-
ENV APP_DEBUG false
79-
ENV LOG_CHANNEL stderr
56+
ENV QUEUE_ENABLED=true
8057

8158
# The number of jobs to process before stopping
82-
ENV WORKER_MAX_JOBS 5
59+
ENV QUEUE_MAX_JOBS 5
8360

8461
# Number of seconds to sleep when no job is available
85-
ENV WORKER_SLEEP 10
62+
ENV QUEUE_SLEEP 10
8663

8764
# Number of seconds to rest between jobs
88-
ENV WORKER_REST 1
65+
ENV QUEUE_REST 1
8966

9067
# The number of seconds a child process can run
91-
ENV WORKER_TIMEOUT 600
68+
ENV QUEUE_TIMEOUT 600
9269

9370
# Number of times to attempt a job before logging it failed
94-
ENV WORKER_TRIES 1
95-
96-
# determines what the container should do if one of the service scripts fails
97-
# 0: Continue silently even if a script has failed.
98-
# 1: Continue but warn with an annoying error message.ext script
99-
# 2: Stop the container.
100-
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
101-
102-
ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME 0
103-
104-
EXPOSE 80
71+
ENV QUEUE_TRIES 1

composer.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "laravel/laravel",
2+
"name": "code4romania/wevote4eu",
33
"type": "project",
44
"description": "The skeleton application for the Laravel framework.",
55
"keywords": [
@@ -8,35 +8,35 @@
88
],
99
"license": "MIT",
1010
"require": {
11-
"php": "^8.2",
12-
"andreiio/blade-remix-icon": "^3.2",
13-
"archtechx/laravel-seo": "^0.10.1",
14-
"blade-ui-kit/blade-icons": "^1.6",
15-
"filament/filament": "^3.2",
16-
"filament/spatie-laravel-media-library-plugin": "^3.2",
11+
"php": "^8.4",
12+
"andreiio/blade-remix-icon": "^3.4",
13+
"archtechx/laravel-seo": "^0.10",
14+
"blade-ui-kit/blade-icons": "^1.8",
15+
"filament/filament": "^3.3",
16+
"filament/spatie-laravel-media-library-plugin": "^3.3",
1717
"jeffgreco13/filament-breezy": "^2.4",
18-
"laravel/framework": "^11.10",
19-
"laravel/pulse": "^1.2",
20-
"laravel/reverb": "@beta",
21-
"laravel/tinker": "^2.9",
22-
"league/flysystem-aws-s3-v3": "^3.28",
23-
"livewire/livewire": "^3.5",
18+
"laravel/framework": "^12.44",
19+
"laravel/pulse": "^1.4",
20+
"laravel/reverb": "^1.6",
21+
"laravel/tinker": "^2.10",
22+
"league/flysystem-aws-s3-v3": "^3.30",
23+
"livewire/livewire": "^3.7",
2424
"maatwebsite/excel": "^3.1",
25-
"owenvoke/blade-fontawesome": "^2.6",
26-
"php-ffmpeg/php-ffmpeg": "^1.2",
27-
"sentry/sentry-laravel": "^4.5"
25+
"owenvoke/blade-fontawesome": "^2.9",
26+
"php-ffmpeg/php-ffmpeg": "^1.3",
27+
"sentry/sentry-laravel": "^4.20"
2828
},
2929
"require-dev": {
30-
"barryvdh/laravel-debugbar": "^3.13",
31-
"barryvdh/laravel-ide-helper": "^3.0",
32-
"fakerphp/faker": "^1.23",
33-
"friendsofphp/php-cs-fixer": "^3.58",
34-
"laravel/pint": "^1.16",
35-
"laravel/sail": "^1.26",
30+
"barryvdh/laravel-debugbar": "^3.16",
31+
"barryvdh/laravel-ide-helper": "^3.6",
32+
"fakerphp/faker": "^1.24",
33+
"friendsofphp/php-cs-fixer": "^3.92",
34+
"laravel/pint": "^1.26",
35+
"laravel/sail": "^1.51",
3636
"mockery/mockery": "^1.6",
37-
"nunomaduro/collision": "^8.0",
38-
"phpunit/phpunit": "^11.0.1",
39-
"spatie/laravel-ignition": "^2.4"
37+
"nunomaduro/collision": "^8.8",
38+
"phpunit/phpunit": "^12.5",
39+
"spatie/laravel-ignition": "^2.9"
4040
},
4141
"autoload": {
4242
"files": [

0 commit comments

Comments
 (0)