From 27e25e2ba2a250e99de92259c0f7b3a528d6ab0c Mon Sep 17 00:00:00 2001 From: TZGyn Date: Sun, 18 Jun 2023 19:29:07 +0800 Subject: [PATCH] Remove laravel/sail --- backend/composer.json | 1 - backend/composer.lock | 138 +------------------------------------ backend/docker-compose.yml | 56 --------------- 3 files changed, 1 insertion(+), 194 deletions(-) delete mode 100644 backend/docker-compose.yml diff --git a/backend/composer.json b/backend/composer.json index f5c4ed3..bea8233 100644 --- a/backend/composer.json +++ b/backend/composer.json @@ -17,7 +17,6 @@ "require-dev": { "fakerphp/faker": "^1.9.1", "laravel/pint": "^1.0", - "laravel/sail": "^1.22", "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^7.0", "phpunit/phpunit": "^10.1", diff --git a/backend/composer.lock b/backend/composer.lock index f6c8882..02b0ded 100644 --- a/backend/composer.lock +++ b/backend/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d8ee2c4b6e26af29ed2bf60c6c6856a6", + "content-hash": "73f6417342d378d09906472181934367", "packages": [ { "name": "brick/math", @@ -6289,71 +6289,6 @@ }, "time": "2023-04-25T14:52:30+00:00" }, - { - "name": "laravel/sail", - "version": "v1.22.0", - "source": { - "type": "git", - "url": "https://github.com/laravel/sail.git", - "reference": "923e1e112b6a8598664dbb0ee79dd3137f1c9d56" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/923e1e112b6a8598664dbb0ee79dd3137f1c9d56", - "reference": "923e1e112b6a8598664dbb0ee79dd3137f1c9d56", - "shasum": "" - }, - "require": { - "illuminate/console": "^8.0|^9.0|^10.0", - "illuminate/contracts": "^8.0|^9.0|^10.0", - "illuminate/support": "^8.0|^9.0|^10.0", - "php": "^8.0", - "symfony/yaml": "^6.0" - }, - "require-dev": { - "orchestra/testbench": "^6.0|^7.0|^8.0", - "phpstan/phpstan": "^1.10" - }, - "bin": [ - "bin/sail" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - }, - "laravel": { - "providers": [ - "Laravel\\Sail\\SailServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Laravel\\Sail\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Docker files for running a basic Laravel application.", - "keywords": [ - "docker", - "laravel" - ], - "support": { - "issues": "https://github.com/laravel/sail/issues", - "source": "https://github.com/laravel/sail" - }, - "time": "2023-05-04T14:52:56+00:00" - }, { "name": "mockery/mockery", "version": "1.5.1", @@ -8329,77 +8264,6 @@ ], "time": "2023-05-25T11:30:27+00:00" }, - { - "name": "symfony/yaml", - "version": "v6.3.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/a9a8337aa641ef2aa39c3e028f9107ec391e5927", - "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "symfony/polyfill-ctype": "^1.8" - }, - "conflict": { - "symfony/console": "<5.4" - }, - "require-dev": { - "symfony/console": "^5.4|^6.0" - }, - "bin": [ - "Resources/bin/yaml-lint" - ], - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Loads and dumps YAML files", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-04-28T13:28:14+00:00" - }, { "name": "theseer/tokenizer", "version": "1.2.1", diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml deleted file mode 100644 index ce7a760..0000000 --- a/backend/docker-compose.yml +++ /dev/null @@ -1,56 +0,0 @@ -version: '3' -services: - laravel.test: - build: - context: ./vendor/laravel/sail/runtimes/8.2 - dockerfile: Dockerfile - args: - WWWGROUP: '${WWWGROUP}' - image: sail-8.2/app - extra_hosts: - - 'host.docker.internal:host-gateway' - ports: - - '${APP_PORT:-80}:80' - - '${VITE_PORT:-5173}:${VITE_PORT:-5173}' - environment: - WWWUSER: '${WWWUSER}' - LARAVEL_SAIL: 1 - XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}' - XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}' - IGNITION_LOCAL_SITES_PATH: '${PWD}' - volumes: - - '.:/var/www/html' - networks: - - sail - depends_on: - - mysql - mysql: - image: 'mysql/mysql-server:8.0' - ports: - - '${FORWARD_DB_PORT:-3306}:3306' - environment: - MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}' - MYSQL_ROOT_HOST: '%' - MYSQL_DATABASE: '${DB_DATABASE}' - MYSQL_USER: '${DB_USERNAME}' - MYSQL_PASSWORD: '${DB_PASSWORD}' - MYSQL_ALLOW_EMPTY_PASSWORD: 1 - volumes: - - 'sail-mysql:/var/lib/mysql' - - './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh' - networks: - - sail - healthcheck: - test: - - CMD - - mysqladmin - - ping - - '-p${DB_PASSWORD}' - retries: 3 - timeout: 5s -networks: - sail: - driver: bridge -volumes: - sail-mysql: - driver: local