Skip to content
Open
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
8 changes: 4 additions & 4 deletions .github/workflows/check.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ jobs:
runs-on: ubuntu-latest
env:
# renovate: datasource=node-version depName=node
NODE_VERSION: 22.20.0
NODE_VERSION: 22.23.1

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 # https://github.com/actions/checkout
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 # https://github.com/actions/checkout

- name: Cache dependencies
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 # https://github.com/actions/cache
uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0 # https://github.com/actions/cache
with:
path: node_modules
key: ${{ runner.os }}-npm-dependencies-${{ hashFiles('package-lock.json') }}
restore-keys: ${{ runner.os }}-npm-dependencies

- name: Set up node
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0 # https://github.com/actions/setup-node
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0 # https://github.com/actions/setup-node
with:
node-version: ${{ env.NODE_VERSION }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check.php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
env:
# renovate: datasource=github-releases depName=php packageName=containerbase/php-prebuild
PHP_VERSION: 8.4.20
PHP_VERSION: 8.4.23
services:
postgres:
image: postgres:16.3-alpine3.18@sha256:64e18e8fb3e9c9aac89ac590c5dd8306b862478404f76cd9b5f7720d012b4c47 # https://hub.docker.com/_/postgres
Expand All @@ -41,20 +41,20 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 # https://github.com/actions/checkout
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 # https://github.com/actions/checkout

- name: Validate composer.json and composer.lock
run: composer validate

- name: Cache dependencies
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 # https://github.com/actions/cache
uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0 # https://github.com/actions/cache
with:
path: vendor
key: ${{ runner.os }}-composer-dependencies-${{ hashFiles('composer.lock') }}
restore-keys: ${{ runner.os }}-composer-dependencies

- name: Setup PHP
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0 # https://github.com/shivammathur/setup-php
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2 # https://github.com/shivammathur/setup-php
with:
php-version: ${{ env.PHP_VERSION }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, intl
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy-to-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: echo "BRANCH_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV

- name: checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0
ref: ${{ env.BRANCH_NAME }}
Expand All @@ -42,10 +42,10 @@ jobs:
run: echo "DEPLOYMENT_PROJECT_VERSION=$(bash ./environment/prod/deployment/scripts/version.sh --long)" >> $GITHUB_ENV

- name: set up Docker Buildx
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0

- name: login to GitHub Container Registry
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
with:
registry: ${{ env.DOCKER_REGISTRY }}
username: ${{ env.DOCKER_REGISTRY_USER_NAME }}
Expand All @@ -56,15 +56,15 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
with:
images: ${{ env.DOCKER_IMAGE_NAME }}
tags: |
type=raw,value=beta
context: workflow

- name: build and push image
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy-to-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: echo "BRANCH_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV

- name: checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0
ref: ${{ env.BRANCH_NAME }}
Expand All @@ -45,10 +45,10 @@ jobs:
run: echo "DEPLOYMENT_PROJECT_VERSION=$(bash ./environment/prod/deployment/scripts/version.sh --long)" >> $GITHUB_ENV

- name: set up Docker Buildx
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0

- name: login to GitHub Container Registry
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
with:
registry: ${{ env.DOCKER_REGISTRY }}
username: ${{ env.DOCKER_REGISTRY_USER_NAME }}
Expand All @@ -59,7 +59,7 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
with:
images: ${{ env.DOCKER_IMAGE_NAME }}
tags: |
Expand All @@ -68,7 +68,7 @@ jobs:
context: workflow

- name: build and push image
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand Down
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@
"ext-intl": "*",
"ext-pdo": "*",
"codezero/laravel-unique-translation": "^4.3.1",
"filament/filament": "^3.3.50",
"filament/spatie-laravel-translatable-plugin": "^3.3.50",
"guzzlehttp/guzzle": "^7.10.0",
"filament/filament": "^3.3.54",
"filament/spatie-laravel-translatable-plugin": "^3.3.54",
"guzzlehttp/guzzle": "^7.10.6",
"intervention/image-laravel": "^1.5.9",
"josiasmontag/laravel-recaptchav3": "^1.0.5",
"laravel/framework": "^12.58.0",
"laravel/sanctum": "^4.3.1",
"laravel/tinker": "^2.10.2",
"laravel/framework": "^12.64.0",
"laravel/sanctum": "^4.3.3",
"laravel/tinker": "^2.11.1",
"mvenghaus/filament-plugin-translatable-inline": "^3.0.8",
"nesbot/carbon": "^3.11.4",
"nesbot/carbon": "^3.13.1",
"opgginc/codezero-laravel-localized-routes": "^5.1.1",
"sentry/sentry-laravel": "^4.25.0"
"sentry/sentry-laravel": "^4.25.1"
},
"require-dev": {
"blumilksoftware/codestyle": "^5.1.1",
"fakerphp/faker": "^1.24.1",
"mockery/mockery": "^1.6.12",
"nunomaduro/collision": "^8.8.3",
"larastan/larastan": "^3.9.6",
"phpunit/phpunit": "^12.5.23",
"nunomaduro/collision": "^8.9.5",
"larastan/larastan": "^3.10.0",
"phpunit/phpunit": "^12.5.31",
"spatie/laravel-ignition": "^2.12.0"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ services:
restart: unless-stopped

mailpit:
image: axllent/mailpit:v1.27.11@sha256:e22dce5b36f93c77082e204a3942fb6b283b7896e057458400a4c88344c3df68
image: axllent/mailpit:v1.30.5@sha256:b868afa176bfd6cce2323ea316cd99ccad77915e51e595748f6d786700ecf109
container_name: website-mailpit-dev
labels:
- "traefik.enable=true"
Expand Down
10 changes: 5 additions & 5 deletions environment/dev/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://hub.docker.com/_/alpine
FROM alpine:3.22.4@sha256:310c62b5e7ca5b08167e4384c68db0fd2905dd9c7493756d356e893909057601 AS secops-tools
FROM alpine:3.22.5@sha256:14358309a308569c32bdc37e2e0e9694be33a9d99e68afb0f5ff33cc1f695dce AS secops-tools

# https://github.com/FiloSottile/age/releases
ARG AGE_VERSION="1.1.1"
Expand All @@ -15,13 +15,13 @@ RUN wget --output-document age.tar.gz "https://github.com/FiloSottile/age/releas
&& chmod +x /usr/local/bin/sops

# For other versions check: https://hub.docker.com/_/composer/tags
FROM composer/composer:2.9.7-bin@sha256:a742abd4ab1087c2d98bc63e84fe6a510886c5afbe35ef227d5932a22ee797dc AS composer-bin
FROM composer/composer:2.9.8-bin@sha256:2cde59fd0009d0b4f0fa8532a189290352d9fe3d80fbcc3a887ac69b9eeeef27 AS composer-bin

# For other versions check: https://hub.docker.com/_/node/tags
FROM node:22.22.2-bullseye-slim@sha256:3b7d1544fc6f5c56b242c67230868a163abca9b938cdafed97537138c23443b1 AS node
FROM node:22.22.3-bullseye-slim@sha256:f81e523790f0a2c86827ff6356a28fad2edbe0fe36bc3c4275a4d1e16304bf43 AS node

# For other versions check: https://hub.docker.com/_/php/tags
FROM php:8.4.20-fpm-bookworm@sha256:122f433659d49f0cac74e44f9ced8ed82bd4b99edbd88748fa09ee25ea539e36
FROM php:8.4.23-fpm-bookworm@sha256:66a10c4b32b2f5886c32a4fb23c6cc3e727661e6a929c241befb335aaee0290e

COPY --from=composer-bin ./composer /usr/bin/composer
COPY --from=secops-tools /usr/local/bin/age /usr/local/bin/age
Expand Down Expand Up @@ -88,7 +88,7 @@ RUN apt-get update \

# For other versions check: https://pecl.php.net/package/xdebug
# renovate: datasource=github-tags depName=xdebug/xdebug
ARG XDEBUG_VERSION=3.4.7
ARG XDEBUG_VERSION=3.5.3
ARG INSTALL_XDEBUG=true

RUN if [ ${INSTALL_XDEBUG} = true ]; then \
Expand Down
6 changes: 3 additions & 3 deletions environment/prod/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### PHP DEPENDENCIES ###
# https://hub.docker.com/_/composer/tags
FROM composer:2.9.7@sha256:dc292c5c0f95f526b051d4c341bf08e7e2b18504c74625e3203d7f123050e318 AS vendor
FROM composer:2.9.8@sha256:b09bccd91a78fe8a9ab4b33d707b862e8fe54fec17782e32683ad2a69c46867d AS vendor

WORKDIR /app_composer_dependencies

Expand All @@ -15,7 +15,7 @@ RUN composer install \

### FRONTEND ###
# https://hub.docker.com/_/node/tags
FROM node:22.22.2-bullseye-slim@sha256:3b7d1544fc6f5c56b242c67230868a163abca9b938cdafed97537138c23443b1 AS frontend
FROM node:22.22.3-bullseye-slim@sha256:f81e523790f0a2c86827ff6356a28fad2edbe0fe36bc3c4275a4d1e16304bf43 AS frontend

WORKDIR /app_frontend_dependencies

Expand All @@ -32,7 +32,7 @@ RUN npm run build

### APPLICATION ###
# https://hub.docker.com/_/php/tags
FROM php:8.4.20-fpm-bookworm@sha256:122f433659d49f0cac74e44f9ced8ed82bd4b99edbd88748fa09ee25ea539e36 AS app
FROM php:8.4.23-fpm-bookworm@sha256:66a10c4b32b2f5886c32a4fb23c6cc3e727661e6a929c241befb335aaee0290e AS app

COPY --from=vendor /usr/bin/composer /usr/local/bin/composer

Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
"lintf": "eslint . --fix"
},
"dependencies": {
"@alpinejs/focus": "^3.15.11",
"@alpinejs/persist": "^3.15.11",
"@alpinejs/focus": "^3.15.12",
"@alpinejs/persist": "^3.15.12",
"@tailwindcss/forms": "^0.5.11",
"@tailwindcss/postcss": "^4.1.18",
"@tailwindcss/typography": "^0.5.19",
"@tailwindcss/postcss": "^4.3.3",
"@tailwindcss/typography": "^0.5.20",
"@types/alpinejs": "^3.13.11",
"alpinejs": "^3.15.11",
"alpinejs": "^3.15.12",
"laravel-vite-plugin": "^1.3.0",
"tailwindcss": "^4.1.18"
"tailwindcss": "^4.3.3"
},
"devDependencies": {
"@blumilksoftware/eslint-config": "^3.0.2",
"@types/alpinejs__focus": "^3.13.4",
"@typescript-eslint/eslint-plugin": "^8.59.0",
"@typescript-eslint/parser": "^8.59.0",
"postcss": "^8.5.12",
"vite": "^6.3.7"
"@typescript-eslint/eslint-plugin": "^8.59.4",
"@typescript-eslint/parser": "^8.59.4",
"postcss": "^8.5.21",
"vite": "^6.4.3"
}
}
Loading