Merge branch 'cicd' into 'develop'

fix: 🐛 use bedrock multistage

See merge request ldc-web/projets/regalette!32

.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/regalette-theme/ /app/srcs/public/app/themes/regalette-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}

composer.json

@@ -27,20 +27,20 @@
     "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",
     "uwil/regalette-theme": "^1.3",
     "wpengine/advanced-custom-fields-pro": "^6.8",
-    "wpackagist-plugin/wordpress-seo": "^27.4",
+    "wpackagist-plugin/wordpress-seo": "^28.8",
     "uwil/admin-secure-wp": "^3.1",
-    "symfony/yaml": "^7.1",
+    "symfony/yaml": "^8.1",
     "ezyang/htmlpurifier": "^4.17"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^3.7.1",
+    "squizlabs/php_codesniffer": "^3.13",
     "roave/security-advisories": "dev-latest",
-    "automattic/vipwpcs": "^2.3",
+    "slevomat/coding-standard": "^8.22",
-    "slevomat/coding-standard": "^8.13"
+    "automattic/vipwpcs": "^3.1"
   },
   "config": {
     "optimize-autoloader": true,

manifest.yaml

@@ -82,9 +82,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