Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/#198-laravel' into #198-laravel
Browse files Browse the repository at this point in the history
# Conflicts:
#	tests/TestCase.php
  • Loading branch information
kamilpiech97 committed Mar 27, 2024
2 parents f421d07 + cf01e65 commit 0819b20
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 84 deletions.
7 changes: 3 additions & 4 deletions .env.ci
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ LOG_LEVEL=debug
DB_CONNECTION=pgsql
DB_HOST=127.0.0.1
DB_PORT=5432
DB_DATABASE=website
DB_USERNAME=website
DB_DATABASE=city-alert-core
DB_USERNAME=city-alert-core
DB_PASSWORD=password
DB_ROOT_PASSWORD=example

BROADCAST_DRIVER=log
CACHE_DRIVER=array
FILESYSTEM_DISK=local
QUEUE_CONNECTION=sync
SESSION_DRIVER=array
SESSION_LIFETIME=120
FILESYSTEM_DISK=local
MAIL_MAILER=array
2 changes: 1 addition & 1 deletion .github/workflows/check.js.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Checking app: testing and linting PHP"
name: "Checking app: testing and linting JS"

on:
pull_request:
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "blumilksoftware/website",
"version": "1.0.0",
"type": "project",
"description": "website project.",
"keywords": ["framework", "laravel"],
Expand Down
113 changes: 57 additions & 56 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions environment/dev/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# For other versions check: https://hub.docker.com/_/composer/tags
FROM composer/composer:2.6.5-bin as composer-bin
FROM composer/composer:2.7.2-bin as composer-bin

# For other versions check: https://hub.docker.com/_/node/tags?page=1&name=bullseye-slim
FROM node:21.1.0-bullseye-slim as node
FROM node:21.7.1-bullseye-slim as node

# For other versions check: https://hub.docker.com/_/php/tags?page=1&name=fpm-bullseye
FROM php:8.3.1-fpm-bullseye
FROM php:8.3.4-fpm-bullseye

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

Expand Down
Loading

0 comments on commit 0819b20

Please sign in to comment.