Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more updates #18

Merged
merged 5 commits into from
Dec 25, 2023
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
7 changes: 5 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ trim_trailing_whitespace = false
[*.{yml,yaml}]
indent_size = 2

[docker-compose.yml]
indent_size = 4
[*.js]
indent_size = 2

[*.vue]
indent_size = 2
6 changes: 4 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": [
"airbnb-base",
"plugin:prettier/recommended",
"plugin:vue/base"
"plugin:vue/base",
"plugin:vitest-globals/recommended"
],
"plugins": [
"prettier",
Expand All @@ -20,6 +21,7 @@
]
},
"env": {
"browser": true
"browser": true,
"vitest-globals/env": true
}
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
.env
.env.backup
.phpstan.cache
.phpunit.result.cache
.phpunit.cache
.php-cs-fixer.cache
auth.json
npm-debug.log
/.idea
/.vscode
docker/nginx/*.pem
tests/html-coverage
resources/js/test-coverage
File renamed without changes.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@php artisan package:discover --ansi"
],
"post-update-cmd": [
"@php artisan clear-compiled",
"@php artisan ide-helper:generate",
"@php artisan ide-helper:meta",
"@php artisan vendor:publish --tag=laravel-assets --ansi --force"
Expand Down
206 changes: 103 additions & 103 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,116 +18,116 @@ version: "3.9"

services:

## The App database
mysql:
container_name: "${COMPOSE_PROJECT_NAME}-mysql"
image: mysql:8.0.35
volumes:
- mysql-data:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD=password
- MYSQL_DATABASE=app # update .env and .env.example if you change any of these values
- MYSQL_USER=app
- MYSQL_PASSWORD=app
ports:
- "${DOCKER_MYSQL_LOCAL_PORT}:3306"
command:
- "--character-set-server=utf8mb4"
- "--collation-server=utf8mb4_unicode_ci"
- "--default-authentication-plugin=mysql_native_password"
restart: unless-stopped
## The App database
mysql:
container_name: "${COMPOSE_PROJECT_NAME}-mysql"
image: mysql:8.0.35
volumes:
- mysql-data:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD=password
- MYSQL_DATABASE=app # update .env and .env.example if you change any of these values
- MYSQL_USER=app
- MYSQL_PASSWORD=app
ports:
- "${DOCKER_MYSQL_LOCAL_PORT}:3306"
command:
- "--character-set-server=utf8mb4"
- "--collation-server=utf8mb4_unicode_ci"
- "--default-authentication-plugin=mysql_native_password"
restart: unless-stopped

## MySQL just for Unit Tests
mysql-test:
container_name: "${COMPOSE_PROJECT_NAME}-mysql-test"
image: mysql:8.0.35
volumes:
- mysql-test-data:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD=password
- MYSQL_DATABASE=apptest # update phpunit.xml if you change any of these values
- MYSQL_USER=app
- MYSQL_PASSWORD=app
command:
- "--character-set-server=utf8mb4"
- "--collation-server=utf8mb4_unicode_ci"
- "--default-authentication-plugin=mysql_native_password"
restart: unless-stopped
## MySQL just for Unit Tests
mysql-test:
container_name: "${COMPOSE_PROJECT_NAME}-mysql-test"
image: mysql:8.0.35
volumes:
- mysql-test-data:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD=password
- MYSQL_DATABASE=apptest # update phpunit.xml if you change any of these values
- MYSQL_USER=app
- MYSQL_PASSWORD=app
command:
- "--character-set-server=utf8mb4"
- "--collation-server=utf8mb4_unicode_ci"
- "--default-authentication-plugin=mysql_native_password"
restart: unless-stopped

redis:
container_name: "${COMPOSE_PROJECT_NAME}-redis"
image: redis:7.0.5-alpine3.17
ports:
- "${DOCKER_REDIS_LOCAL_PORT}:6379"
restart: unless-stopped
redis:
container_name: "${COMPOSE_PROJECT_NAME}-redis"
image: redis:7.0.5-alpine3.17
ports:
- "${DOCKER_REDIS_LOCAL_PORT}:6379"
restart: unless-stopped

## NGINX to support the app, configured to use the php-fpm-debug server
nginx:
container_name: "${COMPOSE_PROJECT_NAME}-nginx"
build:
context: docker/nginx
tags: # required for Docker buildx/bake to tag properly
- "${COMPOSE_PROJECT_NAME}-nginx"
working_dir: /app
volumes:
- .:/app
ports:
- "${DOCKER_NGINX_LOCAL_PORT}:443"
depends_on:
- php-fpm-debug
restart: unless-stopped
## NGINX to support the app, configured to use the php-fpm-debug server
nginx:
container_name: "${COMPOSE_PROJECT_NAME}-nginx"
build:
context: docker/nginx
tags: # required for Docker buildx/bake to tag properly
- "${COMPOSE_PROJECT_NAME}-nginx"
working_dir: /app
volumes:
- .:/app
ports:
- "${DOCKER_NGINX_LOCAL_PORT}:443"
depends_on:
- php-fpm-debug
restart: unless-stopped

## The PHP-FPM that's used for the app development, also useful for code coverage
php-fpm-debug:
container_name: "${COMPOSE_PROJECT_NAME}-php-fpm-debug"
build:
context: docker/php-fpm
tags: # required for Docker buildx/bake to tag properly
- "${COMPOSE_PROJECT_NAME}-php-fpm-debug"
working_dir: /app
volumes:
- .:/app
depends_on:
- mysql
environment:
PHP_IDE_CONFIG: "serverName=${DOCKER_SERVER_NAME}"
restart: unless-stopped
## The PHP-FPM that's used for the app development, also useful for code coverage
php-fpm-debug:
container_name: "${COMPOSE_PROJECT_NAME}-php-fpm-debug"
build:
context: docker/php-fpm
tags: # required for Docker buildx/bake to tag properly
- "${COMPOSE_PROJECT_NAME}-php-fpm-debug"
working_dir: /app
volumes:
- .:/app
depends_on:
- mysql
environment:
PHP_IDE_CONFIG: "serverName=${DOCKER_SERVER_NAME}"
restart: unless-stopped

## The PHP-FPM that's used for unit tests and could possibly be used for production instances
php-fpm:
container_name: "${COMPOSE_PROJECT_NAME}-php-fpm"
build:
context: docker/php-fpm
target: base
tags: # required for Docker buildx/bake to tag properly
- "${COMPOSE_PROJECT_NAME}-php-fpm"
working_dir: /app
volumes:
- .:/app
depends_on:
- mysql
environment:
PHP_IDE_CONFIG: "serverName=${DOCKER_SERVER_NAME}"
restart: unless-stopped
## The PHP-FPM that's used for unit tests and could possibly be used for production instances
php-fpm:
container_name: "${COMPOSE_PROJECT_NAME}-php-fpm"
build:
context: docker/php-fpm
target: base
tags: # required for Docker buildx/bake to tag properly
- "${COMPOSE_PROJECT_NAME}-php-fpm"
working_dir: /app
volumes:
- .:/app
depends_on:
- mysql
environment:
PHP_IDE_CONFIG: "serverName=${DOCKER_SERVER_NAME}"
restart: unless-stopped

## The Horizon worker to process queue jobs
horizon:
container_name: "${COMPOSE_PROJECT_NAME}-horizon"
build:
context: docker/php-fpm
target: base
working_dir: /app
entrypoint: php artisan horizon
volumes:
- .:/app
depends_on:
- mysql
- redis
restart: unless-stopped
## The Horizon worker to process queue jobs
horizon:
container_name: "${COMPOSE_PROJECT_NAME}-horizon"
build:
context: docker/php-fpm
target: base
working_dir: /app
entrypoint: php artisan horizon
volumes:
- .:/app
depends_on:
- mysql
- redis
restart: unless-stopped

volumes:
mysql-data:
mysql-test-data:
mysql-data:
mysql-test-data:

networks:
default:
default:
Loading