From 689e81bc7eae839cc0fd66a765bf15f6b6971dd0 Mon Sep 17 00:00:00 2001 From: Mathieu Ducrot Date: Thu, 4 Jan 2024 15:18:25 +0100 Subject: [PATCH 1/3] #6 Generate the symfony-docker.lock when using docker-fetch --- README.md | 7 ++++++- make/docker.mk | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f6aa8a..cf9bd86 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,12 @@ make df ``` Relaunch the stack (`make up` + `make install` on another terminal if some changes are made on the Dockerfile or make/install.mk files). -Check the diffs and commit any changes that feels relevant to you. + +> A symfony-docker.lock while be generated each time you run the docker-fetch. +> This file helps you to keep track of which version of the docker stack you are currently using. +> It should be committed on your project. + +Finally, check the diffs and commit any changes that feels relevant to you. ## Working on the symfony-docker stack diff --git a/make/docker.mk b/make/docker.mk index a03a35d..31a3e7a 100644 --- a/make/docker.mk +++ b/make/docker.mk @@ -8,6 +8,13 @@ docker-fetch: ## Fetch smartbooster/symfony-docker stack files git remote add docker git@github.com:smartbooster/symfony-docker.git git fetch docker git checkout docker/main . + rm -f symfony-docker.lock + touch symfony-docker.lock + echo '{' >> symfony-docker.lock + echo ' "hash": "'$(shell git rev-parse docker/main)'", ' >> symfony-docker.lock + echo ' "fetch_time": "'$(shell date +%Y-%m-%dT%H:%M:%S)'",' >> symfony-docker.lock + echo ' "tag": "'$(shell git rev-parse docker/main | git tag --contains)'"' >> symfony-docker.lock + echo '}' >> symfony-docker.lock git remote remove docker make docker-post-fetch df: docker-fetch ## Alias for docker-fetch From 8205a8b2bab10e5b95b141309e98925c5394054a Mon Sep 17 00:00:00 2001 From: Mathieu Ducrot Date: Thu, 4 Jan 2024 15:19:34 +0100 Subject: [PATCH 2/3] Remove the dev makefile as it's now handle by the standard-bundle cf. https://github.com/smartbooster/standard-bundle/commit/16c0fe878c4a4ca6acaff542f2338be163114782 --- make/dev.mk | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 make/dev.mk diff --git a/make/dev.mk b/make/dev.mk deleted file mode 100644 index 870baad..0000000 --- a/make/dev.mk +++ /dev/null @@ -1,11 +0,0 @@ -## -## Development -## ----------- -.PHONY: debug-env -debug-env: ## Display the Symfony Container Environment Variables - $(CONSOLE) debug:container --env-vars --env=$(ENV) - -.PHONY: cc -cc: ## Cache clear symfony - $(CONSOLE) cache:clear --no-warmup --env=$(ENV) - $(CONSOLE) cache:warmup --env=$(ENV) From a0303d4e914a794293d725e4f6e366642f1b82c2 Mon Sep 17 00:00:00 2001 From: Mathieu Ducrot Date: Thu, 4 Jan 2024 16:26:51 +0100 Subject: [PATCH 3/3] Solve #15 by adding smartbooster bundles during install-symfony + fix remove imposed symfony/asset-mapper vendor from the --webapp install --- .gitignore | 4 ++++ make/install.mk | 24 +++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 97c2901..18bc9bc 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,7 @@ npm-debug.log yarn-error.log ###< symfony/webpack-encore-bundle ### + +###> smartbooster/standard-bundle ### +/.phpcs-cache +###< smartbooster/standard-bundle ### diff --git a/make/install.mk b/make/install.mk index 077c1ca..03ae8eb 100644 --- a/make/install.mk +++ b/make/install.mk @@ -35,13 +35,31 @@ install-symfony: ## Install a new fresh version of symfony sed '3,4c\ url: "%env(resolve:MYSQL_ADDON_URI)%"\n server_version: "%env(resolve:MYSQL_ADDON_VERSION)%"' -i config/packages/doctrine.yaml sed '5,8d' -i config/packages/doctrine.yaml rm config/packages/messenger.yaml - docker compose exec --user=dev php composer remove symfony/doctrine-messenger - rm phpunit.xml.dist + docker compose exec --user=dev php composer remove symfony/doctrine-messenger symfony/asset-mapper + docker compose exec --user=dev php composer remove --dev phpunit/phpunit + rm -r assets + # Add SmartBooster bundles + docker compose exec --user=dev php composer config --json extra.symfony.endpoint '["https://api.github.com/repos/smartbooster/standard-bundle/contents/recipes.json", "flex://defaults"]' + docker compose exec --user=dev php composer require --dev --no-interaction smartbooster/standard-bundle + docker compose exec --user=dev php composer require --no-interaction smartbooster/core-bundle + git restore package.json + # Run Tests and database status to check that everything works fine + docker compose exec --user=dev php make phpunit + docker compose exec --user=dev php make orm-status echo Install complete! .PHONY: remove-symfony remove-symfony: ## Remove all symfony related files of the repository - sudo rm -rf bin config migrations node_modules public project src templates tests translations vendor ./var/cache ./var/log/php/* composer.json composer.lock phpunit.xml.dist symfony.lock + sudo rm -rf bin config migrations node_modules public project src templates tests translations vendor ./var/cache ./var/log/php/* \ + make/dev.mk \ + make/qualimetry.mk \ + make/test.mk \ + composer.json \ + composer.lock \ + phpcs.xml \ + phpstan.neon \ + phpunit.xml.dist \ + symfony.lock .PHONY: install install: ## Install the project. MUST BY RUN OUTSIDE OF THE DOCKER CONTAINER !