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/deploy-to-beta-manually.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: echo "BRANCH_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV

- name: checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
with:
fetch-depth: 0
ref: ${{ env.BRANCH_NAME }}
Expand All @@ -41,10 +41,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@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1

- name: login to GitHub Container Registry
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
with:
registry: ${{ env.DOCKER_REGISTRY }}
username: ${{ env.DOCKER_REGISTRY_USER_NAME }}
Expand All @@ -62,7 +62,7 @@ jobs:
context: workflow

- name: build and push image
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-to-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ jobs:
DOCKER_REGISTRY_REPO_NAME: toby
steps:
- name: checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0

- name: set deployment project version
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@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1

- name: login to GitHub Container Registry
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
with:
registry: ${{ env.DOCKER_REGISTRY }}
username: ${{ env.DOCKER_REGISTRY_USER_NAME }}
Expand All @@ -53,7 +53,7 @@ jobs:
context: workflow

- name: build and push image
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-and-lint-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0

- name: Cache dependencies
uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
with:
node-version: 22.22.3
node-version: 22.23.3

- name: Instal npm dependencies
run: npm clean-install
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-and-lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
runs-on: ubuntu-24.04
env:
# renovate: datasource=docker depName=php
PHP_VERSION: 8.4.23
PHP_VERSION: 8.4.25
services:
postgres:
image: postgres:15@sha256:74e110c41804365e3915fcc09d5e7a1eff50161aaa94d5da0e58e0cd75ae509c
image: postgres:15@sha256:7e2070cf6ad06fb3cbbd141b1bafbb7fd5bb63e2b6001e6daf34448eb555e4b3
env:
POSTGRES_DB: toby-test
POSTGRES_USER: toby
Expand All @@ -40,7 +40,7 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
- uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0

- name: Validate composer.json and composer.lock
run: composer validate
Expand Down
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@
"php": "^8.4",
"ext-pdo": "*",
"ext-redis": "*",
"azuyalabs/yasumi": "^2.11.0",
"azuyalabs/yasumi": "^2.12.0",
"barryvdh/laravel-dompdf": "^3.1.2",
"dompdf/dompdf": "^3.1.5",
"dompdf/dompdf": "^3.1.6",
"fakerphp/faker": "^1.24.1",
"guzzlehttp/guzzle": "^7.10.0",
"inertiajs/inertia-laravel": "^2.0.24",
"guzzlehttp/guzzle": "^7.10.6",
"inertiajs/inertia-laravel": "^2.0.28",
"laragear/cache-query": "^6.0.0",
"laravel/framework": "^12.0.1",
"laravel/sanctum": "^4.3.3",
"laravel/socialite": "^5.29.0",
"laravel/telescope": "^5.21.0",
"laravel/socialite": "^5.31.0",
"laravel/telescope": "^5.25.0",
"laravel/tinker": "^2.11.1",
"maatwebsite/excel": "^3.1.69",
"phpoffice/phpword": "^1.4.0",
"sentry/sentry-laravel": "^4.27.0",
"sentry/sentry-laravel": "^4.28.0",
"spatie/laravel-google-calendar": "^3.8.5",
"spatie/laravel-model-states": "^2.14.2",
"spatie/laravel-permission": "^6.25.0",
"spatie/laravel-slack-slash-command": "^1.13.0"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^4.0.10",
"barryvdh/laravel-debugbar": "^4.4.4",
"blumilksoftware/codestyle": "^5.1.1",
"laravel/dusk": "^8.6.0",
"mockery/mockery": "^1.6.12",
"laravel/dusk": "^8.7.0",
"mockery/mockery": "^1.6.15",
"nunomaduro/collision": "^8.9.5",
"phpunit/phpunit": "^12.0.10",
"phpunit/phpunit": "^12.5.37",
"spatie/laravel-ignition": "^2.12.0"
},
"autoload": {
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
condition: service_healthy

database:
image: postgres:15@sha256:74e110c41804365e3915fcc09d5e7a1eff50161aaa94d5da0e58e0cd75ae509c
image: postgres:15@sha256:7e2070cf6ad06fb3cbbd141b1bafbb7fd5bb63e2b6001e6daf34448eb555e4b3
container_name: toby-db-dev
environment:
- PGPASSWORD=${DOCKER_DEV_DB_ROOT_PASSWORD}
Expand Down Expand Up @@ -85,7 +85,7 @@ services:
restart: unless-stopped

mailpit:
image: axllent/mailpit:v1.30@sha256:b868afa176bfd6cce2323ea316cd99ccad77915e51e595748f6d786700ecf109
image: axllent/mailpit:v1.31@sha256:b68349e3a014b90c5610bfb26b2ae36f3892d7b8cf25ee140c6c71c98d2fcf48
container_name: toby-mailpit-dev
labels:
- "traefik.enable=true"
Expand All @@ -109,7 +109,7 @@ services:
restart: unless-stopped

selenium:
image: selenium/standalone-chrome@sha256:9569014786466376d3e5cf8a7758562368cd9637f783dcd3abdb2eaf3a0d5cd7
image: selenium/standalone-chrome@sha256:7efe71e7e4a83bdf574b26bd354690928075e8f443223d2ced16a2c208eae1d7
container_name: toby-selenium-dev
volumes:
- /dev/shm:/dev/shm
Expand Down
8 changes: 4 additions & 4 deletions environment/dev/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# renovate: datasource=docker depName=php
ARG PHP_VERSION=8.4.23
ARG PHP_VERSION=8.4.25
ARG PHP_MODULE_NAME=php${PHP_VERSION}
# https://github.com/nginx/unit/tags
ARG UNIT_VERSION=1.34.1-1

FROM alpine:3.22.5@sha256:14358309a308569c32bdc37e2e0e9694be33a9d99e68afb0f5ff33cc1f695dce AS secops-tools
FROM alpine:3.22.6@sha256:5291449c3df73caf6ed85e649dec1b9e818b39a5d8c871e97afc13e9cd5e8fa8 AS secops-tools

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

# https://hub.docker.com/r/composer/composer
FROM composer/composer:2.9.8-bin@sha256:2cde59fd0009d0b4f0fa8532a189290352d9fe3d80fbcc3a887ac69b9eeeef27 AS composer-bin
FROM composer/composer:2.10.3-bin@sha256:696bfbbb82d8ab6ad3672c505bedd659e3815fd1c03cb5ef65ef7ee07a083fa6 AS composer-bin

# https://hub.docker.com/_/node
FROM node:22.22.3-bookworm-slim@sha256:f81e523790f0a2c86827ff6356a28fad2edbe0fe36bc3c4275a4d1e16304bf43 AS node
FROM node:22.23.2-bookworm-slim@sha256:48e4b67d85f87bd551df43704e24d252f56cc5f8e9718841aace50f19948f0f9 AS node

FROM php:${PHP_VERSION}-cli-bookworm AS unit-modules-builder

Expand Down
6 changes: 3 additions & 3 deletions environment/prod/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# renovate: datasource=docker depName=php
ARG PHP_VERSION=8.4.23
ARG PHP_VERSION=8.4.25
ARG PHP_MODULE_NAME=php${PHP_VERSION}
# https://github.com/nginx/unit/tags
ARG UNIT_VERSION=1.34.1-1

### PHP DEPENDENCIES ###
FROM composer:2.9.8@sha256:b09bccd91a78fe8a9ab4b33d707b862e8fe54fec17782e32683ad2a69c46867d AS vendor
FROM composer:2.10.3@sha256:af98f42dfff7c68ba8d53c2164fd9fde1087b7d449514baa38c418b1f6bc4bac AS vendor

WORKDIR /app_composer_dependencies

Expand All @@ -20,7 +20,7 @@ RUN composer install \
--ignore-platform-reqs

### FRONTEND ###
FROM node:22.22.3-bookworm-slim@sha256:f81e523790f0a2c86827ff6356a28fad2edbe0fe36bc3c4275a4d1e16304bf43 AS frontend
FROM node:22.23.2-bookworm-slim@sha256:48e4b67d85f87bd551df43704e24d252f56cc5f8e9718841aace50f19948f0f9 AS frontend

WORKDIR /app_frontend_dependencies

Expand Down
2 changes: 1 addition & 1 deletion environment/prod/deployment/beta/docker-compose.beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
- .deployment

toby-beta-database:
image: postgres:15@sha256:74e110c41804365e3915fcc09d5e7a1eff50161aaa94d5da0e58e0cd75ae509c
image: postgres:15@sha256:7e2070cf6ad06fb3cbbd141b1bafbb7fd5bb63e2b6001e6daf34448eb555e4b3
container_name: toby-beta-database
environment:
- PGPASSWORD=${DOCKER_TOBY_BETA_DB_ROOT_PASSWORD:? variable DOCKER_TOBY_BETA_DB_ROOT_PASSWORD not set}
Expand Down
2 changes: 1 addition & 1 deletion environment/prod/deployment/prod/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
- .deployment

toby-prod-database:
image: postgres:15@sha256:74e110c41804365e3915fcc09d5e7a1eff50161aaa94d5da0e58e0cd75ae509c
image: postgres:15@sha256:7e2070cf6ad06fb3cbbd141b1bafbb7fd5bb63e2b6001e6daf34448eb555e4b3
container_name: toby-prod-database
environment:
- PGPASSWORD=${DOCKER_TOBY_PROD_DB_ROOT_PASSWORD:? variable DOCKER_TOBY_PROD_DB_ROOT_PASSWORD not set}
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@
"@blumilksoftware/eslint-config": "^3.0.2",
"@headlessui/vue": "^1.7.23",
"@heroicons/vue": "^2.2.0",
"@inertiajs/vue3": "^2.3.27",
"@inertiajs/vue3": "^2.3.28",
"@tailwindcss/forms": "^0.5.11",
"@tailwindcss/line-clamp": "^0.4.4",
"@tailwindcss/postcss": "^4.3.3",
"@tailwindcss/typography": "^0.5.20",
"@vitejs/plugin-vue": "^6.0.8",
"@vue/compiler-sfc": "^3.5.40",
"@vitejs/plugin-vue": "^6.0.9",
"@vue/compiler-sfc": "^3.5.43",
"@vueuse/core": "^11.3.0",
"axios": "^1.13.6",
"echarts": "^6.1.0",
"eslint": "^9.39.5",
"flatpickr": "^4.6.13",
"floating-vue": "^5.2.2",
"floating-vue": "^5.4.0",
"laravel-vite-plugin": "^2.1.0",
"lodash": "^4.18.1",
"luxon": "^3.7.2",
"postcss": "^8.5.22",
"postcss": "^8.5.28",
"tailwindcss": "^4.3.3",
"vite": "^7.3.6",
"vue": "^3.5.40",
"vue-echarts": "^8.0.1",
"vue": "^3.5.43",
"vue-echarts": "^8.3.1",
"vue-flatpickr-component": "^11.0.5",
"vue-loader": "^17.4.2",
"vue-material-design-icons": "^5.3.1",
Expand Down
Loading