Add Kube in CI/CD

Author: mistraloz

.env.dist

@@ -1,41 +1,36 @@
 # The password, username et databasename shall be updated
 
-APP_NAME=boilerplatev2
-DATABASE_PASSWORD=thisshallbeupdated
-DATABASE_USERNAME=myapp
-DATABASE_NAME=mydb
-DATABASE_URL=mysql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@mysql:3306/${DATABASE_NAME}?serverVersion=10.7.3-MariaDB
+APP_NAME="boilerplatev2"
+DATABASE_PASSWORD="super-secret"
+DATABASE_USERNAME="api-user"
+DATABASE_NAME="api"
 
+BASE_DOMAIN="${APP_NAME}.localhost"
+API_SUBDOMAIN="api"
+API_ROUTE_FROM_BASE_DOMAIN="/api"
+PHPMYADMIN_DOMAIN="phpmyadmin.${BASE_DOMAIN}"
+PROTOCOL="http"
 
-BASE_DOMAIN=${APP_NAME}.localhost
-API_SUBDOMAIN=api
-API_ROUTE_FROM_BASE_DOMAIN=/api
-PHPMYADMIN_DOMAIN=phpmyadmin.${BASE_DOMAIN}
-PROTOCOL=http
+BACK_APP_NAME="back"
+FRONT_APP_NAME="front"
 
-BACK_APP_NAME=back
-FRONT_APP_NAME=front
-
-API_DOMAIN=${API_SUBDOMAIN}.${BASE_DOMAIN}
+API_DOMAIN="${API_SUBDOMAIN}.${BASE_DOMAIN}"
 
 DEPLOYMENT_TAG=latest
 
-IMAGE_REGISTRY=git.thecodingmachine.com:444/tcm-projects/${APP_NAME}
-BACK_IMAGE_NAME=${IMAGE_REGISTRY}/${BACK_APP_NAME}
-FRONT_IMAGE_NAME=${IMAGE_REGISTRY}/${FRONT_APP_NAME}
-
-BACK_ROUTER_RULE=Host(`${API_DOMAIN}`) || Host(`${BASE_DOMAIN}`) && PathPrefix(`${API_ROUTE_FROM_BASE_DOMAIN}`)
-FRONT_ROUTER_RULE=Host(`${BASE_DOMAIN}`) && ! PathPrefix(`${API_ROUTE_FROM_BASE_DOMAIN}`)
-
-PHPMYADMIN_ROUTER_RULE=Host(`${PHPMYADMIN_DOMAIN}`)
+IMAGE_REGISTRY="git.thecodingmachine.com:444/tcm-projects/${APP_NAME}"
+BACK_IMAGE_NAME="${IMAGE_REGISTRY}/${BACK_APP_NAME}"
+FRONT_IMAGE_NAME="${IMAGE_REGISTRY}/${FRONT_APP_NAME}"
 
+BACK_ROUTER_RULE="Host(`${API_DOMAIN}`) || Host(`${BASE_DOMAIN}`) && PathPrefix(`${API_ROUTE_FROM_BASE_DOMAIN}`)"
+FRONT_ROUTER_RULE="Host(`${BASE_DOMAIN}`) && ! PathPrefix(`${API_ROUTE_FROM_BASE_DOMAIN}`)"
+PHPMYADMIN_ROUTER_RULE="Host(`${PHPMYADMIN_DOMAIN}`)"
 
 # SSO CONFIG
-
-APP_SSO_SERVICEPROVIDER_X509CERT=MIICkDCCAfmgAwIBAgIBADANBgkqhkiG9w0BAQ0FADBlMQswCQYDVQQGEwJmcjEOMAwGA1UECAwFUEFSSVMxDDAKBgNVBAoMA1RDTTEaMBgGA1UEAwwRZnJvbnQuc29jb3RlYy5kZXYxDjAMBgNVBAcMBVBBUklTMQwwCgYDVQQLDANUQ00wHhcNMTcwOTA4MTUyNzM0WhcNMTgwOTA4MTUyNzM0WjBlMQswCQYDVQQGEwJmcjEOMAwGA1UECAwFUEFSSVMxDDAKBgNVBAoMA1RDTTEaMBgGA1UEAwwRZnJvbnQuc29jb3RlYy5kZXYxDjAMBgNVBAcMBVBBUklTMQwwCgYDVQQLDANUQ00wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMKCd0hnMKX40MYR+fZNRqMJjSiDpTPTkV9A0bfQKESZ9esPjNt8Janq+2MGLrm6cRcMXRx8yo/x7pfoCmdiu9D7VNhk69nFsNKH0PQp/jf2+vLPHXgKvlcCFvlaOB/Cvg9UnK9mq83H88LPwvrpaNRl4qDrLS5TTByEIohjFUJrAgMBAAGjUDBOMB0GA1UdDgQWBBSk8/zuzxKBEwpusxRAva7oY7MkrDAfBgNVHSMEGDAWgBSk8/zuzxKBEwpusxRAva7oY7MkrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBDQUAA4GBAGlGJPIGYAKKkhW/EAvJbprOAwLvSEansPR8iQlGOq49k/R+mvvTKyQ4DsUglrjbTqA90MZ3S7IG25rPtX6uG2Gmi8QdpJbvfbvkMqk4aNbHveWm35lhsFpiJhu5ngUvb7RjZAVg9YRJGMufZwA5TKrr57fIKhA45QXxbITEP2gX
-APP_SSO_SERVICEPROVIDER_PRIVATEKEY=MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMKCd0hnMKX40MYR+fZNRqMJjSiDpTPTkV9A0bfQKESZ9esPjNt8Janq+2MGLrm6cRcMXRx8yo/x7pfoCmdiu9D7VNhk69nFsNKH0PQp/jf2+vLPHXgKvlcCFvlaOB/Cvg9UnK9mq83H88LPwvrpaNRl4qDrLS5TTByEIohjFUJrAgMBAAECgYEAgLUgBTLzCABa9ZXTl12PDjc1xsdFu8OVgDg+DamZ27sc9Qv3Iw1FRuiMq/vdU1zBlITD4CPbTeDDBpWuvLainACpk4JJK22JozwLpaqnyrrhPNxphBe3XUREe6Tw53q9cM1j9RlD+PwbM2KbudfBmsi+sPvNK0pEAHFJZhogjfECQQDtwqhYQhLUCmgzMMFNU1PYvPJ6+5cdrgxK5JJhQxKJnclUdnjw3zUwdN3XpJk9ggq/GTCAjd/vE8ILV2DXgD6nAkEA0W5pvJx5EG9hekJ3/LaqcIKNH38uqhm4LPrXaLbUOToVyjBsJhlfRVVQojhOT9mAkTs4RhSP0IZy+Xkvh3s6nQJBALPzOnriN2HpJohoBEXEJZfLGjNerDc4ffFJIkke/K7Pj4uvx0V3ishMC4Ok/p6BCCUuqXkC6FQIvjrbPV6dn80CQQDRAZvMe2vmlwF0/fi436Ng/SjRkh+D6n7/hKaM/kj1g55TVdfYfeGyU95QxliBH9NLHQqgBc0wkb0Uc3iXgMeRAkAm30yjx2YPHjXZydKsJFgNtfI0PvoFS8tv1Ljb3FfflzrKEFFBtwfC/kxJXY+oKIKMSW0YxT0EuOkq3K5uIeGd
+APP_SSO_SERVICEPROVIDER_X509CERT="MIICkDCCAfmgAwIBAgIBADANBgkqhkiG9w0BAQ0FADBlMQswCQYDVQQGEwJmcjEOMAwGA1UECAwFUEFSSVMxDDAKBgNVBAoMA1RDTTEaMBgGA1UEAwwRZnJvbnQuc29jb3RlYy5kZXYxDjAMBgNVBAcMBVBBUklTMQwwCgYDVQQLDANUQ00wHhcNMTcwOTA4MTUyNzM0WhcNMTgwOTA4MTUyNzM0WjBlMQswCQYDVQQGEwJmcjEOMAwGA1UECAwFUEFSSVMxDDAKBgNVBAoMA1RDTTEaMBgGA1UEAwwRZnJvbnQuc29jb3RlYy5kZXYxDjAMBgNVBAcMBVBBUklTMQwwCgYDVQQLDANUQ00wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMKCd0hnMKX40MYR+fZNRqMJjSiDpTPTkV9A0bfQKESZ9esPjNt8Janq+2MGLrm6cRcMXRx8yo/x7pfoCmdiu9D7VNhk69nFsNKH0PQp/jf2+vLPHXgKvlcCFvlaOB/Cvg9UnK9mq83H88LPwvrpaNRl4qDrLS5TTByEIohjFUJrAgMBAAGjUDBOMB0GA1UdDgQWBBSk8/zuzxKBEwpusxRAva7oY7MkrDAfBgNVHSMEGDAWgBSk8/zuzxKBEwpusxRAva7oY7MkrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBDQUAA4GBAGlGJPIGYAKKkhW/EAvJbprOAwLvSEansPR8iQlGOq49k/R+mvvTKyQ4DsUglrjbTqA90MZ3S7IG25rPtX6uG2Gmi8QdpJbvfbvkMqk4aNbHveWm35lhsFpiJhu5ngUvb7RjZAVg9YRJGMufZwA5TKrr57fIKhA45QXxbITEP2gX"
+APP_SSO_SERVICEPROVIDER_PRIVATEKEY="MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMKCd0hnMKX40MYR+fZNRqMJjSiDpTPTkV9A0bfQKESZ9esPjNt8Janq+2MGLrm6cRcMXRx8yo/x7pfoCmdiu9D7VNhk69nFsNKH0PQp/jf2+vLPHXgKvlcCFvlaOB/Cvg9UnK9mq83H88LPwvrpaNRl4qDrLS5TTByEIohjFUJrAgMBAAECgYEAgLUgBTLzCABa9ZXTl12PDjc1xsdFu8OVgDg+DamZ27sc9Qv3Iw1FRuiMq/vdU1zBlITD4CPbTeDDBpWuvLainACpk4JJK22JozwLpaqnyrrhPNxphBe3XUREe6Tw53q9cM1j9RlD+PwbM2KbudfBmsi+sPvNK0pEAHFJZhogjfECQQDtwqhYQhLUCmgzMMFNU1PYvPJ6+5cdrgxK5JJhQxKJnclUdnjw3zUwdN3XpJk9ggq/GTCAjd/vE8ILV2DXgD6nAkEA0W5pvJx5EG9hekJ3/LaqcIKNH38uqhm4LPrXaLbUOToVyjBsJhlfRVVQojhOT9mAkTs4RhSP0IZy+Xkvh3s6nQJBALPzOnriN2HpJohoBEXEJZfLGjNerDc4ffFJIkke/K7Pj4uvx0V3ishMC4Ok/p6BCCUuqXkC6FQIvjrbPV6dn80CQQDRAZvMe2vmlwF0/fi436Ng/SjRkh+D6n7/hKaM/kj1g55TVdfYfeGyU95QxliBH9NLHQqgBc0wkb0Uc3iXgMeRAkAm30yjx2YPHjXZydKsJFgNtfI0PvoFS8tv1Ljb3FfflzrKEFFBtwfC/kxJXY+oKIKMSW0YxT0EuOkq3K5uIeGd"
 # THE SSO APP
-APP_SSO_IDENTITYPROVIDER_X509CERT=MIIDXTCCAkWgAwIBAgIJALmVVuDWu4NYMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMTYxMjMxMTQzNDQ3WhcNNDgwNjI1MTQzNDQ3WjBFMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzUCFozgNb1h1M0jzNRSCjhOBnR+uVbVpaWfXYIR+AhWDdEe5ryY+CgavOg8bfLybyzFdehlYdDRgkedEB/GjG8aJw06l0qF4jDOAw0kEygWCu2mcH7XOxRt+YAH3TVHa/Hu1W3WjzkobqqqLQ8gkKWWM27fOgAZ6GieaJBN6VBSMMcPey3HWLBmc+TYJmv1dbaO2jHhKh8pfKw0W12VM8P1PIO8gv4Phu/uuJYieBWKixBEyy0lHjyixYFCR12xdh4CA47q958ZRGnnDUGFVE1QhgRacJCOZ9bd5t9mr8KLaVBYTCJo5ERE8jymab5dPqe5qKfJsCZiqWglbjUo9twIDAQABo1AwTjAdBgNVHQ4EFgQUxpuwcs/CYQOyui+r1G+3KxBNhxkwHwYDVR0jBBgwFoAUxpuwcs/CYQOyui+r1G+3KxBNhxkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAAiWUKs/2x/viNCKi3Y6blEuCtAGhzOOZ9EjrvJ8+COH3Rag3tVBWrcBZ3/uhhPq5gy9lqw4OkvEws99/5jFsX1FJ6MKBgqfuy7yh5s1YfM0ANHYczMmYpZeAcQf2CGAaVfwTTfSlzNLsF2lW/ly7yapFzlYSJLGoVE+OHEu8g5SlNACUEfkXw+5Eghh+KzlIN7R6Q7r2ixWNFBC/jWf7NKUfJyX8qIG5md1YUeT6GBW9Bm2/1/RiO24JTaYlfLdKK9TYb8sG5B+OLab2DImG99CJ25RkAcSobWNF5zD0O6lgOo3cEdB/ksCq3hmtlC/DlLZ/D8CJ+7VuZnS1rR2naQ==
-APP_SSO_IDENTITYPROVIDER_ENTITYID=http://samltest.${BASE_DOMAIN}/simplesaml/saml2/idp/metadata.php
-APP_SSO_IDENTITYPROVIDER_LOGINURL=http://samltest.${BASE_DOMAIN}/simplesaml/saml2/idp/SSOService.php
-APP_SSO_IDENTITYPROVIDER_LOGOUTURL=http://samltest.${BASE_DOMAIN}/simplesaml/saml2/idp/SSOService.php
+APP_SSO_IDENTITYPROVIDER_X509CERT="MIIDXTCCAkWgAwIBAgIJALmVVuDWu4NYMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMTYxMjMxMTQzNDQ3WhcNNDgwNjI1MTQzNDQ3WjBFMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzUCFozgNb1h1M0jzNRSCjhOBnR+uVbVpaWfXYIR+AhWDdEe5ryY+CgavOg8bfLybyzFdehlYdDRgkedEB/GjG8aJw06l0qF4jDOAw0kEygWCu2mcH7XOxRt+YAH3TVHa/Hu1W3WjzkobqqqLQ8gkKWWM27fOgAZ6GieaJBN6VBSMMcPey3HWLBmc+TYJmv1dbaO2jHhKh8pfKw0W12VM8P1PIO8gv4Phu/uuJYieBWKixBEyy0lHjyixYFCR12xdh4CA47q958ZRGnnDUGFVE1QhgRacJCOZ9bd5t9mr8KLaVBYTCJo5ERE8jymab5dPqe5qKfJsCZiqWglbjUo9twIDAQABo1AwTjAdBgNVHQ4EFgQUxpuwcs/CYQOyui+r1G+3KxBNhxkwHwYDVR0jBBgwFoAUxpuwcs/CYQOyui+r1G+3KxBNhxkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAAiWUKs/2x/viNCKi3Y6blEuCtAGhzOOZ9EjrvJ8+COH3Rag3tVBWrcBZ3/uhhPq5gy9lqw4OkvEws99/5jFsX1FJ6MKBgqfuy7yh5s1YfM0ANHYczMmYpZeAcQf2CGAaVfwTTfSlzNLsF2lW/ly7yapFzlYSJLGoVE+OHEu8g5SlNACUEfkXw+5Eghh+KzlIN7R6Q7r2ixWNFBC/jWf7NKUfJyX8qIG5md1YUeT6GBW9Bm2/1/RiO24JTaYlfLdKK9TYb8sG5B+OLab2DImG99CJ25RkAcSobWNF5zD0O6lgOo3cEdB/ksCq3hmtlC/DlLZ/D8CJ+7VuZnS1rR2naQ=="
+APP_SSO_IDENTITYPROVIDER_ENTITYID="http://samltest.${BASE_DOMAIN}/simplesaml/saml2/idp/metadata.php"
+APP_SSO_IDENTITYPROVIDER_LOGINURL="http://samltest.${BASE_DOMAIN}/simplesaml/saml2/idp/SSOService.php"
+APP_SSO_IDENTITYPROVIDER_LOGOUTURL="http://samltest.${BASE_DOMAIN}/simplesaml/saml2/idp/SSOService.php"

.gitlab-ci.yml

@@ -1,9 +1,9 @@
-# It is shared between includes anyway
 stages:
   - build
   - test
   - deploy
-  - cleanup
+
+# It is shared between includes anyway
 default:
   retry:
     max: 2
@@ -18,18 +18,24 @@ default:
       - unmet_prerequisites
       - scheduler_failure
       - data_integrity_failure
+
 variables:
+  GIT_STRATEGY: fetch
+  GIT_DEPTH: 1
+  CURRENT_WORKFLOW: "undefined"
   TAG_NAME: ${CI_COMMIT_REF_SLUG}
-  IMAGE_NAME: ${CI_REGISTRY_IMAGE}/back
-  IMAGE_WITH_TAG: ${IMAGE_NAME}:${TAG_NAME}
-  FRONT_IMAGE_NAME: ${CI_REGISTRY_IMAGE}/front
-  FRONT_IMAGE_WITH_TAG: ${FRONT_IMAGE_NAME}:${TAG_NAME}
-  DEPLOYMENT_PATH: /tcm_deployment/${CI_PROJECT_NAME}
-  DEPLOYMENT_IP: PUT_YOUR_DEPLOYMENT_IP_HERE
+  BACK_IMAGE: ${CI_REGISTRY_IMAGE}/back
+  BACK_IMAGE_DEV: ${BACK_IMAGE}:${TAG_NAME}-dev
+  BACK_IMAGE_STABLE: ${BACK_IMAGE}:${TAG_NAME}
+  FRONT_IMAGE: ${CI_REGISTRY_IMAGE}/front
+  FRONT_IMAGE_DEV: ${FRONT_IMAGE}:${TAG_NAME}-dev
+  FRONT_IMAGE_STABLE: ${FRONT_IMAGE}:${TAG_NAME}
+#  DEPLOYMENT_PATH: /tcm_deployment/${CI_PROJECT_NAME}
+#  DEPLOYMENT_IP: PUT_YOUR_DEPLOYMENT_IP_HERE
 
 include:
-  - local: gitlab-ci/gitlab-ci-merge-request.yml
-  - local: gitlab-ci/gitlab-ci-tags-prod.yml
-  - local: gitlab-ci/gitlab-ci-branch-main.yml
-  #    rules:
-  #    - if: $CI_COMMIT_TAG =~ /^[0-9]+.[0-9]+.[0-9]+$/
+  - local: 'gitlab-ci/rules.gitlab-ci.yml'
+  - local: 'gitlab-ci/build.gitlab-ci.yml'
+  - local: 'gitlab-ci/test-back.gitlab-ci.yml'
+  - local: 'gitlab-ci/test-front.gitlab-ci.yml'
+  - local: 'gitlab-ci/deploy-k8s.gitlab-ci.yml'

Makefile

@@ -1,158 +1,156 @@
-# .RECIPEPREFIX = "    "
-# Change tabs to space in makefile
-
-# Load .env variable (the prod is added also if there is any)
-ifneq (,$(wildcard ./.env.dist))
-    include .env.dist
-    export
-endif
-ifneq (,$(wildcard ./.env))
-    include .env
-    export
-endif
-ifneq (,$(wildcard ./.env.prod))
-    include .env.prod
-    export
-endif
-
-# connect to the back container
+.DEFAULT_GOAL := help
+SHELL := $(shell which bash)
+
+# Load .env variable
+-include .env.dist
+-include .env
+
+.env: ## Create .env file if it's does not exist
+	cp .env.dist .env
+
+.PHONY: sync-env
+sync-env: .env ## Add variables who did not exist in .env (from .env.dist)
+	@while IFS='=' read -r k v; do \
+	  if [[ ! -z "$$k" && ! -z "$$v" && $${k:0:1} != '#' ]]; then \
+	    grep -q "^$$k=" .env; \
+	    if [[ $$? -ne 0 ]]; then \
+	      echo "Warning : $$k is declared in .env.dist but was not in .env (auto fixed)" >&2; \
+	      echo "# Added by autofix :" >> .env; echo "$$k=$$v" >> .env; \
+	    fi; \
+	  fi; \
+	done < .env.dist
+
 .PHONY: bbash
-bbash: ;\
-    docker compose exec back bash;
+bbash: sync-env ## connect to the back container
+	docker compose exec back bash;
 
-# connect to the front container
 .PHONY: fbash
-fbash: ;\
-    docker compose exec front bash;
+fbash: sync-env ## connect to the front container
+	docker compose exec front bash;
 
-# Launch migration
 .PHONY: migrate
-migrate: ;\
-    docker compose exec back composer -- run  console  doctrine:migrations:migrate -n
+migrate: sync-env ## Launch migration
+	docker compose exec back composer -- run  console  doctrine:migrations:migrate -n
 
-# Force doctrine update from entities
 .PHONY: db-dev-mig
-db-dev-mig: ;\
-    docker compose exec back composer -- run console doctrine\:schema\:update -f
+db-dev-mig: sync-env ## Force doctrine update from entities
+	docker compose exec back composer -- run console doctrine\:schema\:update -f
 
-# Launch generate migration (recommended) from database diff
-# doctrine:schema:validate --skip-sync  is used to check the database mapping before generating the migration,
-# skip-sync is used to skip database and mapping sync validation
-db-mig-diff: ;\
-    docker compose exec back composer -- run console  doctrine:schema:validate --skip-sync && \
-    docker compose exec back composer -- run console make:migration
+db-mig-diff: sync-env ## Launch generate migration (recommended) from database diff
+	# doctrine:schema:validate --skip-sync  is used to check the database mapping before generating the migration,
+	# skip-sync is used to skip database and mapping sync validation
+	docker compose exec back composer -- run console  doctrine:schema:validate --skip-sync
+	docker compose exec back composer -- run console make:migration
 
-# Launch generate migration (not recommended)
 .PHONY: migrate-diff
-db-migrate-diff: ;\
-    docker compose exec back composer -- run  console  doctrine:migrations:diff -n
+db-migrate-diff: sync-env ## Launch generate migration (not recommended)
+	docker compose exec back composer -- run  console  doctrine:migrations:diff -n
 
-# See logs of back
 .PHONY: blogs
-blogs: ;\
-    docker-compose logs back -f
+blogs: ## Display logs of back
+	docker compose logs back -f
 
 .PHONY: flogs
-flogs: ;\
-    docker-compose logs front -f
-# Init dev env
-init-dev: ;\
-    cp -n docker-compose.override.yml.template docker-compose.override.yml; \
-    cp -n .env.dist .env; \
-    echo "Add ${BASE_DOMAIN} and ${API_DOMAIN}  and samltest.${BASE_DOMAIN} to your /etc/hosts"; \
-    if  grep -q ${BASE_DOMAIN} /etc/hosts ; then echo "not adding to /etc/hosts" ; else echo "\n127.0.0.1 ${BASE_DOMAIN} ${API_DOMAIN} samltest.${BASE_DOMAIN}" | sudo tee -a /etc/hosts ; fi
+flogs: sync-env ## Display logs of front
+	docker compose logs front -f
+.PHONY: init-dev
+init-dev: sync-env ## Init dev env
+	cp -n docker-compose.override.yml.template docker-compose.override.yml
+	if uname | grep -ivq "linux"; then \
+		echo "Add $(BASE_DOMAIN) and $(API_DOMAIN)  and samltest.$(BASE_DOMAIN) to your /etc/hosts"; \
+		if  grep -q $(BASE_DOMAIN) /etc/hosts ; then echo "not adding to /etc/hosts" ; else echo "\n127.0.0.1 $(BASE_DOMAIN) $(API_DOMAIN) samltest.$(BASE_DOMAIN)" | sudo tee -a /etc/hosts ; fi \
+    fi
 #
 # Theses are usefull when you use docker
 #
+.PHONY: down
+down: sync-env ## down docker compose
+	docker compose down
 
-# down docker compose
-down: ;\
-    docker compose down
-# up docker compose
-up: ;\
-    DOCKER_BUILDKIT=1 docker compose up -d ; docker compose logs initback back front -f
+.PHONY: up
+up: sync-env ## up docker compose
+	DOCKER_BUILDKIT=1 docker compose up -d
+	docker compose logs initback back front -f
 
-# stronger down (remove volume / image / orphans)
 .PHONY: fdown
-fdown: ;\
-   docker compose down -v --remove-orphans
+fdown: sync-env ## stronger down (remove volume / image / orphans)
+	docker compose down -v --remove-orphans
 
-# stronger up (recreate all container and rebuild the image)
-fup: ;\
-    DOCKER_BUILDKIT=1 docker compose up -d --force-recreate --build
+fup: sync-env ## stronger up (recreate all container and rebuild the image)
+	DOCKER_BUILDKIT=1 docker compose up -d --force-recreate --build
 
-# Soft Restart
 .PHONY: restart
-restart: down up
+restart: down up ## Soft Restart
 
-# Hard restart
 .PHONY: frestart
-frestart: fdown fup
+frestart: fdown fup ## Hard restart
 
 .PHONY: stop-front
-stop-front: ;\
-    DOCKER_BUILDKIT=1 docker compose stop front
+stop-front: sync-env ## stop front container
+	DOCKER_BUILDKIT=1 docker compose stop front
 
 .PHONY: rm-front
-rm-front: ;\
-    DOCKER_BUILDKIT=1 docker compose rm front -f
+rm-front: sync-env ## remove front container
+	DOCKER_BUILDKIT=1 docker compose rm front -f
 
 .PHONY: start-front
-start-front: ;\
-    DOCKER_BUILDKIT=1 docker compose up  front -d
+start-front: sync-env ## start front container
+	DOCKER_BUILDKIT=1 docker compose up  front -d
 
 .PHONY: reset-front
-reset-front: stop-front rm-front start-front
+reset-front: stop-front rm-front start-front ## reset front container
 
 .PHONY: dumpautoload
-dumpautoload: ;\
+dumpautoload: sync-env ## dump the composer autoloader
 	docker compose exec back composer -- dumpautoload
 
 #
 # Theses are static analyses + tests
 #
 
 .PHONY: phpmd
-phpmd: ;\
+phpmd: sync-env ## phpMD
 	docker compose exec back composer -- run phpmd
 
 .PHONY: cs-fix
-cs-fix: ;\
+cs-fix: sync-env ## cs-fix
 	docker compose exec back composer -- run cs-fix
 
 
 .PHONY: cs-check
-cs-check: ;\
+cs-check: sync-env ## cs-check
 	docker compose exec back composer -- run cs-check
 
 .PHONY: phpstan
-phpstan: ;\
+phpstan: sync-env ## phpstan
 	docker compose exec back composer -- run phpstan
 
 .PHONY: frontlint
-frontlint: ;\
+frontlint: sync-env ## lint front (fix)
 	docker compose exec front yarn lint --fix
 
 .PHONY: frontcheck
-frontcheck: ;\
-	docker compose exec front yarn lint
+frontcheck: ## lint front (check)
+	docker sync-env compose exec front yarn lint
 
-# Run all CI tools
 .PHONY: ci
-ci: cs-fix phpstan phpmd cs-check frontlint
+ci: cs-fix phpstan phpmd cs-check frontlint ## Run all CI tools
 
 
 .PHONY: drop-db-dev
-drop-db-dev: ;\
+drop-db-dev: ## Drop database
 	docker compose exec back bin/console doctrine:schema:drop --full-database --force
 
-.PHONY: fixtures-dev
-fixtures-dev: ;\
-	docker compose exec back bin/console doctrine:fixtures:load -n
-
 .PHONY: reset-db
-reset-db: drop-db-dev migrate fixtures-dev
+reset-db: drop-db-dev migrate ## reset database and load fixtures
+	docker compose exec back bin/console doctrine:fixtures:load -n --append
 
 .PHONY: dump
-dump: ;\
-    docker compose exec mysql mysqldump -u ${DATABASE_USERNAME} -p${DATABASE_PASSWORD} ${DATABASE_NAME} > apps/back/dump/dump.sql
+dump: ## dump database in apps/back/dump/dump.sql (use git lfs)
+	docker compose exec mysql mysqldump -u $(DATABASE_USERNAME) -p$(DATABASE_PASSWORD) $(DATABASE_NAME) > apps/back/dump/dump.sql
+	gzip -f apps/back/dump/dump.sql
+	git lfs track ./apps/back/dump/dump.sql.gz
+
+.PHONY: help
+help: ## This help.
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)

apps/back/.env

@@ -17,8 +17,8 @@
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 ###> symfony/framework-bundle ###
-APP_ENV=dev
-APP_SECRET=0ec29fdfe2bfce3ae4c3b8a6159354e4
+#APP_ENV=dev
+#APP_SECRET=0ec29fdfe2bfce3ae4c3b8a6159354e4
 ###< symfony/framework-bundle ###
 
 ###> doctrine/doctrine-bundle ###
@@ -27,5 +27,4 @@ APP_SECRET=0ec29fdfe2bfce3ae4c3b8a6159354e4
 #
 # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4"
-DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=14&charset=utf8"
 ###< doctrine/doctrine-bundle ###