Merge remote-tracking branch 'origin/main' into #24-news

# Conflicts: # composer.lock # package-lock.json # package.json
blumilksoftware · Aug 19, 2024 · b380631 · b380631
2 parents c400850 + 818c257
commit b380631
Show file tree

Hide file tree

Showing 12 changed files with 221 additions and 312 deletions.
diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
@@ -9,4 +9,4 @@ jobs:
     name: Check PR title
     runs-on: ubuntu-20.04
     steps:
-      - uses: blumilksoftware/[email protected]
+      - uses: blumilksoftware/action-pr-title@e05fc76a1cc45b33644f1de51218be43ac121dd0 # v1.2.0
diff --git a/.github/workflows/deploy-to-beta-by-push.yml b/.github/workflows/deploy-to-beta-by-push.yml
@@ -22,7 +22,7 @@ jobs:
         run: echo "BRANCH_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
 
       - name: checkout
-        uses: actions/[email protected].1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0
           ref: ${{ env.BRANCH_NAME }}
@@ -37,25 +37,25 @@ 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@v3.3.0
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
 
       - name: login to GitHub Container Registry
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
       - name: Docker meta
         id: meta
-        uses: docker/[email protected]
+        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
         with:
           images: ghcr.io/${{ github.repository_owner }}/${{ env.REPO_NAME }}
           tags: type=raw,value=beta
           context: git
 
       - name: build and push image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0
         with:
           context: .
           file: ./environment/prod/app/Dockerfile
@@ -67,7 +67,7 @@ jobs:
           cache-to: type=gha, ref=ghcr.io/${{ github.repository_owner }}/${{ env.REPO_NAME }}-beta-build-cache, mode=max
 
       - name: copy files via ssh
-        uses: appleboy/[email protected]
+        uses: appleboy/scp-action@917f8b81dfc1ccd331fef9e2d61bdc6c8be94634 # v0.1.7
         with:
           timeout: 10s
           command_timeout: 10m
@@ -81,7 +81,7 @@ jobs:
           rm: true
 
       - name: run deployment script over ssh
-        uses: appleboy/[email protected]
+        uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
         with:
           timeout: 10s
           command_timeout: 10m

diff --git a/.github/workflows/test-and-lint-js.yml b/.github/workflows/test-and-lint-js.yml
@@ -18,17 +18,17 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Cache dependencies
-        uses: actions/[email protected]
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: node_modules
           key: ${{ runner.os }}-npm-dependencies-${{ hashFiles('package.lock') }}
           restore-keys: ${{ runner.os }}-npm-dependencies
 
       - name: Set up node
-        uses: actions/[email protected].2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 20
 

diff --git a/.github/workflows/test-and-lint-php.yml b/.github/workflows/test-and-lint-php.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
     services:
       pgsql:
-        image: postgres:15.2-alpine3.17
+        image: postgres:15.5-alpine3.17@sha256:1961f9d61a86948fb3c02ef87a6616f74f3530d10a1cd299b84abba7ed6db791
         env:
           POSTGRES_DB: keating
           POSTGRES_USER: keating
@@ -34,20 +34,20 @@ jobs:
           - 5432:5432
 
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Validate composer.json and composer.lock
         run: composer validate
 
       - name: Cache dependencies
-        uses: actions/[email protected]
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: vendor
           key: ${{ runner.os }}-composer-dependencies-${{ hashFiles('composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-dependencies
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.30.2
+        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # 2.31.1
         with:
           php-version: 8.3
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, intl

diff --git a/composer.json b/composer.json
@@ -8,20 +8,20 @@
     "require": {
         "php": "^8.3",
         "ext-pdo": "*",
-        "fakerphp/faker": "^1.23",
-        "guzzlehttp/guzzle": "^7.8",
+        "fakerphp/faker": "^1.23.1",
+        "guzzlehttp/guzzle": "^7.9.2",
         "inertiajs/inertia-laravel": "^1.3",
-        "laravel/framework": "^11.14",
-        "laravel/sanctum": "^4.0",
+        "laravel/framework": "^11.20.0",
+        "laravel/sanctum": "^4.0.2",
         "laravel/tinker": "^2.9",
-        "spatie/laravel-options": "^1.1",
-        "stevebauman/purify": "^6.0"
+        "spatie/laravel-options": "^1.1.1",
+        "stevebauman/purify": "^6.2.0"
     },
     "require-dev": {
-        "blumilksoftware/codestyle": "^3.2",
-        "mockery/mockery": "^1.6",
-        "nunomaduro/collision": "^8.1",
-        "phpunit/phpunit": "^11.2",
+        "blumilksoftware/codestyle": "^3.3",
+        "mockery/mockery": "^1.6.12",
+        "nunomaduro/collision": "^8.4.0",
+        "phpunit/phpunit": "^11.3.1",
         "spatie/laravel-ignition": "^2.8"
     },
     "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -49,7 +49,7 @@ services:
                 condition: service_healthy
 
     database:
-        image: postgres:15.2-alpine3.17
+        image: postgres:15.5-alpine3.17@sha256:1961f9d61a86948fb3c02ef87a6616f74f3530d10a1cd299b84abba7ed6db791
         container_name: keating-db-dev
         environment:
             - POSTGRES_USER=${DB_USERNAME}
@@ -71,7 +71,7 @@ services:
         restart: unless-stopped
 
     redis:
-        image: redis:7.0.11-alpine3.17
+        image: redis:7.0.11-alpine3.17@sha256:cbcf5bfbc3eaa232b1fa99e539459f46915a41334d46b54bf894f8837a7f071e
         container_name: keating-redis-dev
         ports:
             - ${DOCKER_REDIS_HOST_PORT:-3852}:6379

diff --git a/environment/dev/app/Dockerfile b/environment/dev/app/Dockerfile
@@ -1,8 +1,8 @@
-FROM composer/composer:2.7.2-bin AS composer-bin
+FROM composer/composer:2.7.7-bin@sha256:1832641f1ba36c8e748f4b4462f77e7c8836cca7730fdf0540580d703b78f2e7 AS composer-bin
 
-FROM node:21.7.3-bullseye-slim AS node
+FROM node:21.7.3-bullseye-slim@sha256:50adaf5a166e4e3dc01e77e9bdb4c35e34ef32a1e9e26200019cddb2b154fb34 AS node
 
-FROM php:8.3.6-fpm-bullseye
+FROM php:8.3.10-fpm-bullseye@sha256:857b7cdf42fc4e5b313548e6f6260fce0534439e30915824a5ac3efe9a121dff
 
 COPY --from=composer-bin ./composer /usr/bin/composer
 

diff --git a/environment/prod/app/Dockerfile b/environment/prod/app/Dockerfile
@@ -1,5 +1,5 @@
 ### PHP DEPENDENCIES ###
-FROM composer:2.7.2 AS vendor
+FROM composer:2.7.7@sha256:2088445f2bcaea6fe72cefcdd9ef0cb75139ee103459cc0d1dad496e19847d2c AS vendor
 
 WORKDIR /app_composer_dependencies
 
@@ -14,7 +14,7 @@ RUN composer install \
     --ignore-platform-reqs
 
 ### FRONTEND ###
-FROM node:21.7.3-bullseye-slim AS frontend
+FROM node:21.7.3-bullseye-slim@sha256:50adaf5a166e4e3dc01e77e9bdb4c35e34ef32a1e9e26200019cddb2b154fb34 AS frontend
 
 WORKDIR /app_frontend_dependencies
 
@@ -28,7 +28,7 @@ COPY resources/css ./resources/css/
 RUN npm run build
 
 ### APPLICATION ###
-FROM php:8.3.6-fpm-bullseye AS app
+FROM php:8.3.10-fpm-bullseye@sha256:857b7cdf42fc4e5b313548e6f6260fce0534439e30915824a5ac3efe9a121dff AS app
 
 COPY --from=vendor /usr/bin/composer /usr/local/bin/composer
 

diff --git a/environment/prod/deployment/beta/docker-compose.beta.yml b/environment/prod/deployment/beta/docker-compose.beta.yml
@@ -46,7 +46,7 @@ services:
       - .deployment
 
   keating-beta-database:
-    image: postgres:15.2-alpine3.17
+    image: postgres:15.5-alpine3.17@sha256:1961f9d61a86948fb3c02ef87a6616f74f3530d10a1cd299b84abba7ed6db791
     container_name: keating-beta-database
     environment:
       - PGPASSWORD=${DOCKER_KEATING_BETA_DB_ROOT_PASSWORD:? variable DOCKER_KEATING_BETA_DB_ROOT_PASSWORD not set}
@@ -65,7 +65,7 @@ services:
     restart: unless-stopped
 
   keating-beta-redis:
-    image: redis:7.0.11-alpine3.17
+    image: redis:7.0.11-alpine3.17@sha256:cbcf5bfbc3eaa232b1fa99e539459f46915a41334d46b54bf894f8837a7f071e
     container_name: keating-beta-redis
     healthcheck:
       test: [ "CMD-SHELL", "redis-cli ping | grep PONG" ]