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
8 changes: 4 additions & 4 deletions .github/workflows/test-and-lint-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ jobs:
runs-on: ubuntu-24.04
env:
# renovate: datasource=node-version depName=node
NODE_VERSION: 24.4.1
NODE_VERSION: 24.12.0

steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # https://github.com/actions/checkout
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 # https://github.com/actions/checkout

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

- name: Set up node
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 # https://github.com/actions/setup-node
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0 # https://github.com/actions/setup-node
with:
node-version: ${{ env.NODE_VERSION }}

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 @@ -19,20 +19,20 @@ jobs:
runs-on: ubuntu-24.04
env:
# renovate: datasource=github-releases depName=php packageName=containerbase/php-prebuild
PHP_VERSION: 8.4.13
PHP_VERSION: 8.4.16

steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # https://github.com/actions/checkout
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 # https://github.com/actions/checkout

- name: Cache dependencies
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 # https://github.com/actions/cache
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.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@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5 # https://github.com/shivammathur/setup-php
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0 # 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
2 changes: 1 addition & 1 deletion .github/workflows/test-bash-script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout repository
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # https://github.com/actions/checkout
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 # https://github.com/actions/checkout

- name: Run Bash Script
run: |
Expand Down
8 changes: 4 additions & 4 deletions src/.github/workflows/test-and-lint-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ jobs:
runs-on: ubuntu-24.04
env:
# renovate: datasource=node-version depName=node
NODE_VERSION: 24.4.1
NODE_VERSION: 24.12.0

steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # https://github.com/actions/checkout
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 # https://github.com/actions/checkout

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

- name: Set up node
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 # https://github.com/actions/setup-node
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0 # https://github.com/actions/setup-node
with:
node-version: ${{ env.NODE_VERSION }}

Expand Down
8 changes: 4 additions & 4 deletions src/.github/workflows/test-and-lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-24.04
env:
# renovate: datasource=github-releases depName=php packageName=containerbase/php-prebuild
PHP_VERSION: 8.4.13
PHP_VERSION: 8.4.16
services:
pgsql:
image: postgres:16.3-alpine3.18@sha256:64e18e8fb3e9c9aac89ac590c5dd8306b862478404f76cd9b5f7720d012b4c47 # https://hub.docker.com/_/postgres
Expand All @@ -37,20 +37,20 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # https://github.com/actions/checkout
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 # https://github.com/actions/checkout

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

- name: Cache dependencies
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 # https://github.com/actions/cache
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.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@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5 # https://github.com/shivammathur/setup-php
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0 # 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
14 changes: 7 additions & 7 deletions src/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
"php": "^8.4",
"ext-pdo": "*",
"guzzlehttp/guzzle": "^7.10.0",
"inertiajs/inertia-laravel": "^2.0.10",
"laravel/framework": "^12.35.1",
"laravel/sanctum": "^4.2.0",
"laravel/tinker": "^2.10.1"
"inertiajs/inertia-laravel": "^2.0.18",
"laravel/framework": "^12.44.0",
"laravel/sanctum": "^4.2.1",
"laravel/tinker": "^2.10.2"
},
"require-dev": {
"blumilksoftware/codestyle": "^v5.1.1",
"fakerphp/faker": "^1.24.1",
"larastan/larastan": "^3.7.2",
"larastan/larastan": "^3.8.1",
"mockery/mockery": "^1.6.12",
"nunomaduro/collision": "^8.8.2",
"phpunit/phpunit": "^12.2.9",
"nunomaduro/collision": "^8.8.3",
"phpunit/phpunit": "^12.5.4",
"spatie/laravel-ignition": "^2.9.1"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ services:
restart: unless-stopped

mailpit:
image: axllent/mailpit:v1.27.10@sha256:b1f1be18af530d939a11ee8820b379e0c88eeec204d904bfad68862adced3a5a
image: axllent/mailpit:v1.27.11@sha256:e22dce5b36f93c77082e204a3942fb6b283b7896e057458400a4c88344c3df68
container_name: example-app-mailpit-dev
labels:
- "traefik.enable=true"
Expand Down
12 changes: 6 additions & 6 deletions src/environment/.docker/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM registry.blumilk.pl/internal-public/secops-tools-bin:v1.2.0@sha256:be2755b1afeeae009abdeeb61b7214776776df5b50c818c1546072563139d12c AS secops-tools-bin
FROM composer:2.8.12@sha256:5248900ab8b5f7f880c2d62180e40960cd87f60149ec9a1abfd62ac72a02577c AS composer
FROM ghcr.io/php/pie:1.2.1-bin@sha256:8599d93b0e12de1deb775612d4311d3993cb95b1aeba841ff0b49bd1f1beb12d AS pie-bin
FROM node:24.10.0-bookworm-slim@sha256:b8d2197aff9129d16c801a3e3e1b2a873c4946480f5a310f38056df2268c38d9 AS node
FROM composer:2.9.3@sha256:f746ca10fd351429e13a6fc9599ccd41d4fc413e036ae8b0dad9e2041adcffcd AS composer
FROM ghcr.io/php/pie:1.3.5-bin@sha256:22847c506640f5e8351850334b009da485c57db6ea245515759968911ae6d348 AS pie-bin
FROM node:24.12.0-bookworm-slim@sha256:b83af04d005d8e3716f542469a28ad2947ba382f6b4a76ddca0827a21446a540 AS node

FROM php:8.4.13-fpm-bookworm@sha256:7d2da5cefa899465565aedf5888b1b55ea72748e53fbe1397e217921add0238f AS base
FROM php:8.4.16-fpm-bookworm@sha256:17f936aab6398c83c89a7c234118183004fda951e127c32d798014d30e54d08c AS base

COPY --from=composer /usr/bin/composer /usr/bin/composer
COPY --from=pie-bin /pie /usr/bin/pie

# For other versions check: https://nginx.org/packages/mainline/debian/pool/nginx/n/nginx/
# renovate: datasource=github-tags depName=nginx/nginx extractVersion=^release-(?<version>.*)$
ARG NGINX_VERSION="1.29.2"
ARG NGINX_VERSION="1.29.4"

RUN apt-get update \
&& apt-get install --assume-yes gpg \
Expand Down Expand Up @@ -61,7 +61,7 @@ RUN ln --symbolic /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/
&& chown --no-dereference ${USER_NAME}:root /usr/local/bin/npx

# renovate: datasource=github-tags depName=xdebug/xdebug
ARG XDEBUG_VERSION=3.4.6
ARG XDEBUG_VERSION=3.4.7
ARG INSTALL_XDEBUG=false

RUN if [ ${INSTALL_XDEBUG} = true ]; then \
Expand Down
26 changes: 13 additions & 13 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@
"tsc": "vue-tsc"
},
"dependencies": {
"@inertiajs/vue3": "^2.0.17",
"@tailwindcss/forms": "^0.5.10",
"@tailwindcss/postcss": "^4.1.16",
"@inertiajs/vue3": "^2.3.6",
"@tailwindcss/forms": "^0.5.11",
"@tailwindcss/postcss": "^4.1.18",
"@tailwindcss/typography": "^0.5.19",
"@tailwindcss/vite": "^4.1.16",
"@tailwindcss/vite": "^4.1.18",
"laravel-vite-plugin": "^2.0.1",
"lodash": "^4.17.21",
"tailwindcss": "^4.1.16",
"vue": "^3.5.22"
"tailwindcss": "^4.1.18",
"vue": "^3.5.26"
},
"devDependencies": {
"@blumilksoftware/eslint-config": "^3.0.2",
"@typescript-eslint/eslint-plugin": "^8.46.2",
"@vitejs/plugin-vue": "^6.0.1",
"autoprefixer": "^10.4.21",
"eslint": "^9.38.0",
"@typescript-eslint/eslint-plugin": "^8.46.4",
"@vitejs/plugin-vue": "^6.0.3",
"autoprefixer": "^10.4.23",
"eslint": "^9.39.2",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-vue": "^10.5.1",
"eslint-plugin-vue": "^10.6.2",
"postcss": "^8.5.6",
"vite": "^7.0.7",
"vue-tsc": "^3.0.9"
"vite": "^7.0.8",
"vue-tsc": "^3.0.10"
}
}