From 7a776b73655820df9726348cf63dde21fbea5fa9 Mon Sep 17 00:00:00 2001 From: AchillesKal Date: Tue, 28 Nov 2023 22:49:04 +0200 Subject: [PATCH] Remove symfony related stuff --- README.md | 6 +----- compose.yaml | 10 +--------- docs/extra-services.md | 8 -------- docs/makefile.md | 9 --------- frankenphp/conf.d/app.ini | 1 - 5 files changed, 2 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index fafbce734..9a309dc0e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ with [FrankenPHP](https://frankenphp.dev) and [Caddy](https://caddyserver.com/) 1. If not already done, [install Docker Compose](https://docs.docker.com/compose/install/) (v2.10+) 2. Run `docker compose build --no-cache` to build fresh images 3. Run `docker compose up --pull always -d --wait` to start the project -4. Open `https://localhost` in your favorite web browser and [accept the auto-generated TLS certificate](https://stackoverflow.com/a/15076602/1352334) +4. Open `https://lalhost` in your favorite web browser and [accept the auto-generated TLS certificate](https://stackoverflow.com/a/15076602/1352334) 5. Run `docker compose down --remove-orphans` to stop the Docker containers. ## Features @@ -19,10 +19,6 @@ with [FrankenPHP](https://frankenphp.dev) and [Caddy](https://caddyserver.com/) * Just 1 service by default * Blazing-fast performance thanks to [the worker mode of FrankenPHP](https://github.com/dunglas/frankenphp/blob/main/docs/worker.md) (automatically enabled in prod mode) * [Installation of extra Docker Compose services](docs/extra-services.md) with Symfony Flex -* Automatic HTTPS (in dev and prod) -* HTTP/3 and [Early Hints](https://symfony.com/blog/new-in-symfony-6-3-early-hints) support -* Real-time messaging thanks to a built-in [Mercure hub](https://symfony.com/doc/current/mercure.html) -* [Vulcain](https://vulcain.rocks) support * Automatic HTTPS (in dev and in prod!) * Native [XDebug](docs/xdebug.md) integration * Super-readable configuration diff --git a/compose.yaml b/compose.yaml index 728aa70eb..7b2cc5ce9 100644 --- a/compose.yaml +++ b/compose.yaml @@ -4,18 +4,10 @@ services: restart: unless-stopped environment: SERVER_NAME: ${SERVER_NAME:-localhost}, php:80 - MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!} - MERCURE_SUBSCRIBER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!} TRUSTED_PROXIES: ${TRUSTED_PROXIES:-127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16} TRUSTED_HOSTS: ^${SERVER_NAME:-example\.com|localhost}|php$$ - # Run "composer require symfony/orm-pack" to install and configure Doctrine ORM - DATABASE_URL: postgresql://${POSTGRES_USER:-app}:${POSTGRES_PASSWORD:-!ChangeMe!}@database:5432/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-15}&charset=${POSTGRES_CHARSET:-utf8} - # Run "composer require symfony/mercure-bundle" to install and configure the Mercure integration - MERCURE_URL: ${CADDY_MERCURE_URL:-http://php/.well-known/mercure} - MERCURE_PUBLIC_URL: https://${SERVER_NAME:-localhost}/.well-known/mercure - MERCURE_JWT_SECRET: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!} +# DATABASE_URL: postgresql://${POSTGRES_USER:-app}:${POSTGRES_PASSWORD:-!ChangeMe!}@database:5432/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-15}&charset=${POSTGRES_CHARSET:-utf8} # The two next lines can be removed after initial installation - SYMFONY_VERSION: ${SYMFONY_VERSION:-} STABILITY: ${STABILITY:-stable} volumes: - caddy_data:/data diff --git a/docs/extra-services.md b/docs/extra-services.md index ac827944f..5edf7cd16 100644 --- a/docs/extra-services.md +++ b/docs/extra-services.md @@ -2,11 +2,3 @@ Symfony Docker is extensible. When you install a compatible Composer package using Symfony Flex, the recipe will automatically modify the `Dockerfile` and `docker-compose.yml` to fulfill the requirements of this package. - -The currently supported packages are: - -* `symfony/orm-pack`: install a PostgreSQL service -* `symfony/mercure-bundle`: use the Mercure.rocks module shipped with Caddy -* `symfony/panther`: install chromium and these drivers -* `symfony/mailer`: install a MailCatcher service -* `blackfireio/blackfire-symfony-meta`: install a Blackfire service diff --git a/docs/makefile.md b/docs/makefile.md index 98e2b7b44..506988519 100644 --- a/docs/makefile.md +++ b/docs/makefile.md @@ -13,8 +13,6 @@ For example, in the [getting started section](/README.md#getting-started), the Of course, this template is basic for now. But, as your application is growing, you will probably want to add some targets like running your tests as described -in [the Symfony book](https://symfony.com/doc/current/the-fast-track/en/17-tests.html#automating-your-workflow-with-a-makefile). -You can also find a more complete example in this [snippet](https://www.strangebuzz.com/en/snippets/the-perfect-makefile-for-symfony). If you want to run make from within the `php` container, in the [Dockerfile](/Dockerfile), add: @@ -79,11 +77,4 @@ vendor: ## Install vendors according to the current composer.lock file vendor: c=install --prefer-dist --no-dev --no-progress --no-scripts --no-interaction vendor: composer -## —— Symfony 🎵 ——————————————————————————————————————————————————————————————— -sf: ## List all Symfony commands or pass the parameter "c=" to run a given command, example: make sf c=about - @$(eval c ?=) - @$(SYMFONY) $(c) - -cc: c=c:c ## Clear the cache -cc: sf ``` diff --git a/frankenphp/conf.d/app.ini b/frankenphp/conf.d/app.ini index 501fa84f8..c48fd68a7 100644 --- a/frankenphp/conf.d/app.ini +++ b/frankenphp/conf.d/app.ini @@ -5,7 +5,6 @@ apc.enable_cli = 1 session.use_strict_mode = 1 zend.detect_unicode = 0 -; https://symfony.com/doc/current/performance.html realpath_cache_size = 4096K realpath_cache_ttl = 600 opcache.interned_strings_buffer = 16