Merge pull request #30 from smartbooster/6_symfony_docker_lock

Solve #6 with symfony-docker.lock + #15 to auto install smartbooster bundles

.gitignore

@@ -25,3 +25,7 @@
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
+
+###> smartbooster/standard-bundle ###
+/.phpcs-cache
+###< smartbooster/standard-bundle ###

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
 

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

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 !