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
6 changes: 3 additions & 3 deletions .github/workflows/deploy-to-beta-manually.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0

- name: login to GitHub Container Registry
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.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@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand All @@ -88,7 +88,7 @@ jobs:
rm: true

- name: run deployment script over ssh
uses: appleboy/ssh-action@823bd89e131d8d508129f9443cad5855e9ba96f0 # v1.2.4
uses: appleboy/ssh-action@0ff4204d59e8e51228ff73bce53f80d53301dee2 # v1.2.5
with:
timeout: 10s
command_timeout: 10m
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-to-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0

- name: login to GitHub Container Registry
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.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@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
with:
context: .
file: ./environment/prod/app/Dockerfile
Expand All @@ -78,7 +78,7 @@ jobs:
target: ${{ secrets.TOBY_VPS_LIVE_APP_PATH }}
rm: true

- uses: appleboy/ssh-action@823bd89e131d8d508129f9443cad5855e9ba96f0 # v1.2.4
- uses: appleboy/ssh-action@0ff4204d59e8e51228ff73bce53f80d53301dee2 # v1.2.5
with:
timeout: 10s
command_timeout: 10m
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-command-on-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: run php artisan command
uses: appleboy/ssh-action@823bd89e131d8d508129f9443cad5855e9ba96f0 # v1.2.4
uses: appleboy/ssh-action@0ff4204d59e8e51228ff73bce53f80d53301dee2 # v1.2.5
with:
timeout: 10s
command_timeout: 10m
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 @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1

- name: Cache dependencies
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: node_modules
key: ${{ runner.os }}-npm-dependencies-${{ hashFiles('package.lock') }}
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
with:
node-version: 22.17.1
node-version: 22.22.2

- name: Instal npm dependencies
run: npm clean-install
Expand Down
8 changes: 4 additions & 4 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.16
PHP_VERSION: 8.4.19
services:
postgres:
image: postgres:15@sha256:a7711af921c380de0fda7c48a61fab5ac4def145fd9fc00ccea7355fd6270bb4
image: postgres:15@sha256:c635fa3e3b7421a659d34abdfd6d492f679cbe8149e261a501237b55c5a94212
env:
POSTGRES_DB: toby-test
POSTGRES_USER: toby
Expand All @@ -46,14 +46,14 @@ jobs:
run: composer validate

- name: Cache dependencies
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: vendor
key: ${{ runner.os }}-composer-dependencies-${{ hashFiles('composer.lock') }}
restore-keys: ${{ runner.os }}-composer-dependencies

- name: Setup PHP
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: ${{ env.PHP_VERSION }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, intl, gd
Expand Down
40 changes: 20 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,34 @@
"php": "^8.4",
"ext-pdo": "*",
"ext-redis": "*",
"azuyalabs/yasumi": "^2.9.0",
"barryvdh/laravel-dompdf": "^3.1.1",
"dompdf/dompdf": "^3.1.4",
"azuyalabs/yasumi": "^2.10.0",
"barryvdh/laravel-dompdf": "^3.1.2",
"dompdf/dompdf": "^3.1.5",
"fakerphp/faker": "^1.24.1",
"guzzlehttp/guzzle": "^7.10.0",
"inertiajs/inertia-laravel": "^2.0.18",
"inertiajs/inertia-laravel": "^2.0.22",
"laragear/cache-query": "^4.2.2",
"laravel/framework": "^11.45.3",
"laravel/sanctum": "^4.1.2",
"laravel/socialite": "^5.24.1",
"laravel/telescope": "^5.16.1",
"laravel/tinker": "^2.10.2",
"maatwebsite/excel": "^3.1.67",
"laravel/framework": "^11.51.0",
"laravel/sanctum": "^4.3.1",
"laravel/socialite": "^5.24.3",
"laravel/telescope": "^5.19.0",
"laravel/tinker": "^2.11.1",
"maatwebsite/excel": "^3.1.68",
"phpoffice/phpword": "^1.4.0",
"sentry/sentry-laravel": "^4.15.3",
"spatie/laravel-google-calendar": "^3.8.4",
"spatie/laravel-model-states": "^2.11.3",
"spatie/laravel-permission": "^6.24.0",
"spatie/laravel-slack-slash-command": "^1.12.2"
"sentry/sentry-laravel": "^4.24.0",
"spatie/laravel-google-calendar": "^3.8.5",
"spatie/laravel-model-states": "^2.13.1",
"spatie/laravel-permission": "^6.24.1",
"spatie/laravel-slack-slash-command": "^1.13.0"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.16.3",
"barryvdh/laravel-debugbar": "^3.16.5",
"blumilksoftware/codestyle": "^4.1.0",
"laravel/dusk": "^8.3.4",
"laravel/dusk": "^8.3.6",
"mockery/mockery": "^1.6.12",
"nunomaduro/collision": "^8.8.3",
"phpunit/phpunit": "^11.5.46",
"spatie/laravel-ignition": "^2.9.1"
"nunomaduro/collision": "^8.9.1",
"phpunit/phpunit": "^11.5.55",
"spatie/laravel-ignition": "^2.12.0"
},
"autoload": {
"psr-4": {
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:a7711af921c380de0fda7c48a61fab5ac4def145fd9fc00ccea7355fd6270bb4
image: postgres:15@sha256:c635fa3e3b7421a659d34abdfd6d492f679cbe8149e261a501237b55c5a94212
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.27@sha256:e22dce5b36f93c77082e204a3942fb6b283b7896e057458400a4c88344c3df68
image: axllent/mailpit:v1.29@sha256:c5a6d0ba4d08187f70f305471da5fd9ad424fdfc2f25a2308226a786335dfa9f
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:57bc98a9023c2189459dfaa0b4f127300007ef70d7dba3444c837338c468dba4
image: selenium/standalone-chrome@sha256:aae9b4477f2c1af57c0d7c7e3711211d2287ceb865b9ec8d0b59c6c2a83416a5
container_name: toby-selenium-dev
volumes:
- /dev/shm:/dev/shm
Expand Down
10 changes: 5 additions & 5 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.11
ARG PHP_VERSION=8.4.19
ARG PHP_MODULE_NAME=php${PHP_VERSION}
# https://github.com/nginx/unit/tags
ARG UNIT_VERSION=1.34.1-1

FROM alpine:3.22.2@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 AS secops-tools
FROM alpine:3.22.3@sha256:55ae5d250caebc548793f321534bc6a8ef1d116f334f18f4ada1b2daad3251b2 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.8.12-bin@sha256:f1a57d9cabfc04430058288eaab6c18967b19a3870b5fe71bf0c6afd67968653 AS composer-bin
FROM composer/composer:2.9.5-bin@sha256:d2cb40ee5709ed47a41f0d5de97a270c73c30d2efc16163714c57f56bf2690cf AS composer-bin

# https://hub.docker.com/_/node
FROM node:22.17.1-bullseye-slim@sha256:741a60f76e79ab4080ebb10d24ec0c2aa4527fc44e33a8d609c416cc351b4fff AS node
FROM node:22.22.2-bullseye-slim@sha256:c286bc140790fa918e9fa32f1b44f66ee0bfd9c9c10a1ca05361c1ae48daf3de AS node

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

Expand Down Expand Up @@ -120,7 +120,7 @@ RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmour --o

# 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.1
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,11 +1,11 @@
# renovate: datasource=docker depName=php
ARG PHP_VERSION=8.4.11
ARG PHP_VERSION=8.4.19
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.8.12@sha256:5248900ab8b5f7f880c2d62180e40960cd87f60149ec9a1abfd62ac72a02577c AS vendor
FROM composer:2.9.5@sha256:743aebe48ca67097c36819040633ea77e44a561eca135e4fc84c002e63a1ba07 AS vendor

WORKDIR /app_composer_dependencies

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

### FRONTEND ###
FROM node:22.17.1-bullseye-slim@sha256:741a60f76e79ab4080ebb10d24ec0c2aa4527fc44e33a8d609c416cc351b4fff AS frontend
FROM node:22.22.2-bullseye-slim@sha256:c286bc140790fa918e9fa32f1b44f66ee0bfd9c9c10a1ca05361c1ae48daf3de 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:a7711af921c380de0fda7c48a61fab5ac4def145fd9fc00ccea7355fd6270bb4
image: postgres:15@sha256:c635fa3e3b7421a659d34abdfd6d492f679cbe8149e261a501237b55c5a94212
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:a7711af921c380de0fda7c48a61fab5ac4def145fd9fc00ccea7355fd6270bb4
image: postgres:15@sha256:c635fa3e3b7421a659d34abdfd6d492f679cbe8149e261a501237b55c5a94212
container_name: toby-prod-database
environment:
- PGPASSWORD=${DOCKER_TOBY_PROD_DB_ROOT_PASSWORD:? variable DOCKER_TOBY_PROD_DB_ROOT_PASSWORD not set}
Expand Down
Loading
Loading