Merge branch 'cicd' into 'develop'

fix: 🐛 update composer version in dockerfile

See merge request ldc-web/projets/la-toque-angevine!24

.gitlab-ci.yml

@@ -1,22 +1,20 @@
 include:
-  - project: "ldc-web/shared-ci"
+- project: 'ldc-web/shared-ci'
-    ref: "main"
+  ref: 'main'
-    file: "security/composer.yml"
+  file: 'security/security.yml'
-  - project: "ldc-web/shared-ci"
+- project: 'ldc-web/shared-ci'
-    ref: "main"
+  ref: 'main'
-    file: "build/composer-bedrock-8.3.yml"
+  file: "build/docker-bedrock-multistage.yml"
-  - project: "ldc-web/shared-ci"
+- project: 'ldc-web/shared-ci'
-    ref: "main"
+  ref: 'main'
-    file: "build/docker-bedrock.yml"
+  file: 'test/test.yml'
-  - project: "ldc-web/shared-ci"
+- project: 'ldc-web/shared-ci'
-    ref: "main"
+  ref: 'main'
-    file: "test/test.yml"
+  file: 'deploy/deploy.yml'
-  - project: "ldc-web/shared-ci"
+
-    ref: "main"
-    file: "deploy/deploy.yml"
 
 stages:
-  - security
+- security
-  - build
+- build
-  - test
+- test
-  - deploy
+- deploy

Dockerfile

@@ -1,7 +1,33 @@
-ARG PHP_8_5_TAG=latest
+FROM composer:2.11 AS vendor
+
+ARG GITLAB_USER
+ARG GITLAB_PASSWORD
+
+ARG APP_ACF_USER
+ARG APP_ACF_PWD
+COPY composer.json composer.json
+COPY composer.lock composer.lock
+
+RUN composer config gitlab-token.lab.s-web.fr ${GITLAB_USER} ${GITLAB_PASSWORD}
+RUN composer config http-basic.connect.advancedcustomfields.com ${APP_ACF_USER} ${APP_ACF_PWD}
+
+RUN composer install \
+    --no-dev \
+    --optimize-autoloader \
+    --classmap-authoritative
+
+ARG PHP_8_5_TAG=latest
+FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-production-8.5:${PHP_8_5_TAG}
+
+ARG USER=www-data
+
+COPY --chown=${USER}:${USER} . /app/srcs
+COPY --from=vendor --chown=${USER}:${USER} /app/vendor/ /app/srcs/vendor/
+COPY --from=vendor --chown=${USER}:${USER} /app/public/wp/ /app/srcs/public/wp/
+COPY --from=vendor --chown=${USER}:${USER} /app/public/app/mu-plugins/ /app/srcs/public/app/mu-plugins/
+COPY --from=vendor --chown=${USER}:${USER} /app/public/app/plugins/ /app/srcs/public/app/plugins/
+COPY --from=vendor --chown=${USER}:${USER} /app/public/app/themes/la-toque-angevine-theme/ /app/srcs/public/app/themes/la-toque-angevine-theme/
 
-FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.5:${PHP_8_5_TAG}
-COPY --chown=www-data:www-data . /app/srcs
 USER root
 RUN chmod -R 755 /app/srcs/public/app/uploads
-USER www-data
+USER ${USER}

RGPD.md

@@ -0,0 +1,40 @@
+
+# RGPD
+
+## Site
+
+### En base de données
+
+| Table | Colonne | Contenu | Utilisation |
+| ----- | ------- | ------- | ----------- |
+| lta_plannings | matricule | Matricule d'un salarié | Identifier le salarié |
+| lta_plannings | name | Nom complet d'un salarié | Identifier le salarié |
+| lta_plannings | service | Service dans lequel travail le salarié | Gestion du planning |
+| lta_plannings | week | Numéro de semaine | Gestion du planning |
+| lta_plannings | planning | Tableau avec les horaires et fonction du salarié | Gestion du planning |
+| --- | --- | --- | --- |
+| lta_surveys_answers | matricule | Matricule d'un salarié | Identifier le salarié |
+| lta_surveys_answers | firstname | Prénom d'un salarié | Identifier le salarié |
+| lta_surveys_answers | lastname | Nom d'un salarié | Identifier le salarié |
+| --- | --- | --- | --- |
+| lta_usermeta | meta_value | Des informations sur l'utilisateur, avec par exemple le nom et le prénom | Affichage sur le site ou BO |
+| --- | --- | --- | --- |
+| lta_users | user_email | Adresse mail | Identifiant, sert à la connexion au BO |
+
+### Formulaire de contact (marketing)
+
+| Donnée | Contenu |
+| ------ | ------- |
+| Nom | Nom de la personne |
+| Prénom | Prénom de la personne |
+| Adresse E-mail | Adresse email de la personne |
+| Téléphone fixe | Numéro de téléphone de la personne |
+| Téléphone portable | Numéro de téléphone de la personne |
+| Pièce jointe | Photo renseignée par la personne |
+
+## Cookies
+
+| Service | Utilité |
+| ------- | ------- |
+| Matomo | Mesure d'audience |
+| Google Recaptcha | Empêcher la soumission de formulaire par des robots |

composer.json

@@ -26,7 +26,7 @@
     "oscarotero/env": "^2.1",
     "roots/bedrock-autoloader": "^1.0",
     "roots/bedrock-disallow-indexing": "^2.0",
-    "roots/wordpress": "^7.0",
+    "roots/wordpress": "^7.1.4",
     "roots/wp-config": "1.0.0",
     "wpengine/advanced-custom-fields-pro": "^6.8",
     "uwil/cmc-lta-wp": "^1.0",
@@ -34,16 +34,16 @@
     "uwil/users-lta-wp": "^1.0",
     "uwil/la-toque-angevine-theme": "^1.1",
     "uwil/admin-secure-wp": "^3.1",
-    "wpackagist-plugin/wordpress-seo": "^27.3",
+    "wpackagist-plugin/wordpress-seo": "^28.8",
     "uwil/import-social-networks-wp": "^2.0",
-    "guzzlehttp/guzzle": "^7.8",
+    "guzzlehttp/guzzle": "^8.3",
-    "respect/validation": "^2.3"
+    "respect/validation": "^3.1"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^3.7.1",
+    "squizlabs/php_codesniffer": "^3.13",
     "roave/security-advisories": "dev-latest",
-    "slevomat/coding-standard": "^8.13",
+    "slevomat/coding-standard": "^8.22",
-    "automattic/vipwpcs": "^2.2"
+    "automattic/vipwpcs": "^3.1"
   },
   "config": {
     "optimize-autoloader": true,

manifest.yaml

@@ -93,9 +93,9 @@ spec:
       imagePullSecrets:
         - name: docker-registry-credentials
       securityContext:
-        runAsUser: 33
+        runAsUser: 82
-        runAsGroup: 33
+        runAsGroup: 82
-        fsGroup: 33
+        fsGroup: 82
         fsGroupChangePolicy: "OnRootMismatch"
       volumes:
         - name: storage
@@ -173,9 +173,9 @@ spec:
           imagePullSecrets:
             - name: docker-registry-credentials
           securityContext:
-            runAsUser: 33
+            runAsUser: 82
-            runAsGroup: 33
+            runAsGroup: 82
-            fsGroup: 33
+            fsGroup: 82
             fsGroupChangePolicy: "OnRootMismatch"
           restartPolicy: OnFailure