Merge remote-tracking branch 'origin/develop'

Author: koromerzhin

Taskfile.yml

@@ -13,14 +13,14 @@ includes:
 
 vars:
   # Variables avec valeurs par défaut depuis .env ou valeurs de fallback
-  PROJECT_NAME: '{{.PROJECT_NAME | default "phpfpm"}}'
+  PROJECT_NAME: '{{.PROJECT_NAME | default "prestashop"}}'
   PROJECT_VERSION: '1.0.0'
   ENVIRONMENT: '{{.ENVIRONMENT | default "development"}}'
-  STACK_NAME: '{{.STACK | default "phpfpm"}}'
+  STACK_NAME: '{{.STACK | default "prestashop"}}'
   FOLDERSQL: '{{.FOLDERSQL | default "database_init"}}'
   FILESQL: '{{.FILESQL | default "dump.sql"}}'
   FOLDERLAMPY: '{{.FOLDERLAMPY | default "lampy"}}'
-  SERVERNAME: '{{.SERVERNAME | default "phpfpm.traefik.me"}}'
+  SERVERNAME: '{{.SERVERNAME | default "prestashop.traefik.me"}}'
   DOCKERCOMPOSEFILE: '{{.DOCKERCOMPOSEFILE | default "docker-compose.yml"}}'
 
 tasks:
@@ -34,6 +34,13 @@ tasks:
     - task --list
     - echo ""
 
+  create:apps:
+    cmds:
+    - wget https://github.com/PrestaShop/PrestaShop/releases/download/8.0.1/prestashop_8.0.1.zip -O prestashop.zip
+    - unzip prestashop.zip -d unzip
+    - unzip unzip/prestashop.zip -d apps
+    - rm -rf unzip prestashop.zip
+
   lint:all:
     desc: "Exécute tous les linters disponibles"
     cmds:
@@ -54,16 +61,16 @@ tasks:
     cmds:
     - task: default
 
-  phpfpm:getapacheconf:
+  prestashop:getapacheconf:
     desc: "Récupère la configuration Apache depuis l'image Docker"
     silent: true
     cmds:
     - rm -rf ./conf/apache2 || true
-    - docker create --name phpfpm-php koromerzhin/php:8.4.3-apache
+    - docker create --name prestashop-php koromerzhin/php:8.4.3-apache
     - mkdir -p ./conf/apache2
-    - docker cp phpfpm-php:/etc/apache2/sites-available/000-default.conf ./conf/apache2/000-default.conf
-    - docker cp phpfpm-php:/etc/apache2/apache2.conf ./conf/apache2/apache2.conf
-    - docker rm -f phpfpm-php
+    - docker cp prestashop-php:/etc/apache2/sites-available/000-default.conf ./conf/apache2/000-default.conf
+    - docker cp prestashop-php:/etc/apache2/apache2.conf ./conf/apache2/apache2.conf
+    - docker rm -f prestashop-php
 
     - sed -ri -e 's|\$\{APACHE_DOCUMENT_ROOT\}|/var/www/public|g' ./conf/apache2/000-default.conf
     - sed -ri -e 's|#ServerName www.example.com|ServerName {{.SERVERNAME}}|g' ./conf/apache2/000-default.conf
@@ -77,8 +84,8 @@ tasks:
       #\
       ServerName {{.SERVERNAME}}' ./conf/apache2/apache2.conf
 
-  phpfpm:copysql:
-    desc: "Copie le fichier SQL de dump dans le dossier phpfpm"
+  prestashop:copysql:
+    desc: "Copie le fichier SQL de dump dans le dossier prestashop"
     silent: true
     cmds:
     - task: utils:file:copy
@@ -87,15 +94,15 @@ tasks:
         DEST_DIR: "{{.FOLDERLAMPY}}/mariadb_init/"
         FORCE: true
 
-  phpfpm:getpull-image:
+  prestashop:getpull-image:
     desc: "Télécharge les images Docker définies dans le docker-compose.yml"
     silent: true
     cmds:
     - task: docker:images:pull
       vars:
         COMPOSE_FILE: "{{.DOCKERCOMPOSEFILE}}"
 
-  phpfpm:deploy:
+  prestashop:deploy:
     desc: "Déploie les stacks Docker définies dans les fichiers docker-compose"
     silent: true
     cmds:
@@ -104,13 +111,13 @@ tasks:
         COMPOSE_FILE: "{{.DOCKERCOMPOSEFILE}}"
         STACK_NAME: "{{.STACK_NAME}}"
 
-  phpfpm:install-first:
+  prestashop:install-first:
     desc: "Installation initiale de Composer et des dépendances"
     silent: true
     cmds:
     - docker run --rm -v $(pwd)/apps:/var/www -w /var/www koromerzhin/php:8.4.3-apache composer install
 
-  phpfpm:waiting:
+  prestashop:waiting:
     desc: "Attend que les services soient opérationnels"
     silent: true
     cmds:
@@ -119,51 +126,52 @@ tasks:
         CONTAINERS: "www"
         STACK_NAME: "{{.STACK_NAME}}"
 
-  phpfpm:ls:
+  prestashop:ls:
     desc: "Liste les stacks et services Docker"
     silent: true
     cmds:
     - task: docker:stack:services
       vars:
         STACK_NAME: "{{.STACK_NAME}}"
 
-  phpfpm:exec:
+  prestashop:exec:
     desc: "Exécute une commande dans un conteneur en cours d'exécution"
     silent: true
     cmds:
-    - task: phpfpm:copysql
-    - task: phpfpm:getpull-image
-    - task: phpfpm:getapacheconf
-    - task: phpfpm:deploy
-    - task: phpfpm:waiting
-    - task: phpfpm:ls
+    - task: prestashop:copysql
+    - task: create:apps
+    - task: prestashop:getpull-image
+    - task: prestashop:getapacheconf
+    - task: prestashop:deploy
+    - task: prestashop:waiting
+    - task: prestashop:ls
 
-  phpfpm:download-phar:
+  prestashop:download-phar:
     desc: "Télécharger les différents fichiers phar"
     silent: true
     cmds:
     - task: download:php:tools
       vars:
         TOOLS_DIR: ./../apps
 
-  phpfpm:bash:
+  prestashop:bash:
     desc: "Ouvre un shell bash dans le conteneur www"
     silent: true
     cmds:
     - task: docker:stack:shell
       vars:
-        STACK_NAME: "phpfpm"
+        STACK_NAME: "prestashop"
         SERVICE_NAME: "www"
 
-  phpfpm:cmd-exec:
+  prestashop:cmd-exec:
     desc: "Lance une commande"
     silent: true
     vars:
       INTERACTIVE: '{{.INTERACTIVE | default "true"}}'
     cmds:
     - task: docker:stack:exec
       vars:
-        STACK_NAME: "phpfpm"
+        STACK_NAME: "prestashop"
         SERVICE_NAME: "www"
         COMMAND: "{{.COMMAND}}"
         INTERACTIVE: "{{.INTERACTIVE}}"
@@ -174,7 +182,7 @@ tasks:
     vars:
       CMD: '{{.CMD | default ""}}'
     cmds:
-    - task: phpfpm:cmd-exec
+    - task: prestashop:cmd-exec
       vars:
         COMMAND: "composer {{.CMD}}"