chore(docker-compose): upgrading to mariadb 11

Author: Benoit Ngo

.env.dist

@@ -38,3 +38,4 @@ APP_SSO_IDENTITYPROVIDER_LOGOUTURL="http://samltest.${BASE_DOMAIN}/simplesaml/sa
 ###> symfony/mailer ###
 MAILER_DSN=smtp://mail:1025
 MAIL_HOST=admin@mail.com
+API_PREFIX="/api"

apps/back/config/packages/security.yaml

@@ -31,10 +31,10 @@ security:
     # Easy way to control access for large sections of your site
     # Note: Only the *first* access control that matches will be used
     access_control:
-        - { path: '^/%app.url.prefix%/login$', roles: PUBLIC_ACCESS }
-        - { path: '^/%app.url.prefix%/auth/sso/', roles: PUBLIC_ACCESS }
-        - { path: '^/%app.url.prefix%/healthcheck$', roles: PUBLIC_ACCESS }
-        - { path: '^/%app.url.prefix%/', roles: IS_AUTHENTICATED_FULLY }
+        - { path: '^/%app.api.url.prefix%/login$', roles: PUBLIC_ACCESS }
+        - { path: '^/%app.api.url.prefix%/auth/sso/', roles: PUBLIC_ACCESS }
+        - { path: '^/%app.api.url.prefix%/healthcheck$', roles: PUBLIC_ACCESS }
+        - { path: '^/%app.api.url.prefix%/', roles: IS_AUTHENTICATED_FULLY }
 
     role_hierarchy:
         ROLE_ADMIN:

apps/back/config/routes/annotations.yaml

@@ -1,7 +1,7 @@
 controllers:
     resource: ../../src/Controller/
     type: annotation
-    prefix: '/%app.url.prefix%/'
+    prefix: '/%app.api.url.prefix%/'
 
 kernel:
     resource: ../../src/Kernel.php

apps/back/config/services.yaml

@@ -6,7 +6,8 @@
 parameters:
     app.mail.host: "%env(MAIL_HOST)%"
     app.url.base: "%env(APP_URL)%"
-    app.url.prefix: "%env(APP_PREFIX)%"
+    app.api.version: "1.0"
+    app.api.url.prefix: "%env(API_PREFIX)%/%app.api.version%"
    # app.url.webapp: "%env(APP_URL_WEBAPP)%"
     # OUR APP
     app.sso.serviceprovider.x509cert: "%env(APP_SSO_SERVICEPROVIDER_X509CERT)%"
@@ -21,8 +22,8 @@ parameters:
         debug: true
         sp:
             entityId: '%app.url.base%'
-            assertionConsumerService: { url: '%app.url.base%/%app.url.prefix%/auth/sso/saml2/login' }
-            singleLogoutService: { url: "%app.url.base%/%app.url.prefix%/auth/sso/saml2/logout" }
+            assertionConsumerService: { url: '%app.url.base%/%app.api.url.prefix%/auth/sso/saml2/login' }
+            singleLogoutService: { url: "%app.url.base%/%app.api.url.prefix%/auth/sso/saml2/logout" }
             NameIDFormat: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
             x509cert: "%app.sso.serviceprovider.x509cert%"
             privateKey: "%app.sso.serviceprovider.privateKey%"

docker-compose.override.yml.template

@@ -49,8 +49,6 @@ services:
       - traefik.http.services.phpmyadmin_service.loadbalancer.server.port=80
     environment:
       PMA_HOSTS: "mysql, mysql_tests"
-      PMA_USER: "$DATABASE_USERNAME"
-      PMA_PASSWORD: "$DATABASE_PASSWORD"
       UPLOAD_LIMIT: "100M"
 
   mysql:

docker-compose.yml

@@ -10,23 +10,23 @@ services:
       - traefik.http.routers.back_router.service=back_service
       - traefik.http.services.back_service.loadbalancer.server.port=80
     environment:
-      DATABASE_URL: "mysql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@mysql:3306/${DATABASE_NAME}?serverVersion=mariadb-10.11.3"
-      TESTS_DATABASE_URL: "mysql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@mysql_tests:3306/${DATABASE_NAME}?serverVersion=mariadb-10.11.3"
+      DATABASE_URL: "mysql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@mysql:3306/${DATABASE_NAME}?serverVersion=mariadb-11.1.2"
+      TESTS_DATABASE_URL: "mysql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@mysql_tests:3306/${DATABASE_NAME}?serverVersion=mariadb-11.1.2"
       APP_SSO_SERVICEPROVIDER_X509CERT: ${APP_SSO_SERVICEPROVIDER_X509CERT}
       APP_SSO_SERVICEPROVIDER_PRIVATEKEY: ${APP_SSO_SERVICEPROVIDER_PRIVATEKEY}
       APP_SSO_IDENTITYPROVIDER_X509CERT: ${APP_SSO_IDENTITYPROVIDER_X509CERT}
       APP_SSO_IDENTITYPROVIDER_ENTITYID: ${APP_SSO_IDENTITYPROVIDER_ENTITYID}
       APP_SSO_IDENTITYPROVIDER_LOGINURL: ${APP_SSO_IDENTITYPROVIDER_LOGINURL}
       APP_SSO_IDENTITYPROVIDER_LOGOUTURL: ${APP_SSO_IDENTITYPROVIDER_LOGOUTURL}
       APP_URL: ${PROTOCOL}://${BASE_DOMAIN}
-      APP_PREFIX: ${APP_PREFIX}
+      API_PREFIX: ${API_PREFIX}
       MAILER_DSN: ${MAILER_DSN}
       MAIL_HOST: ${MAIL_HOST}
       APP_SECRET: "secretforapp"
    #   APP_URL_WEBAPP: "${PROTOCOL}://${DOMAIN}"
 
   mysql:
-    image: 'mariadb:10.11'
+    image: 'mariadb:11.1'
     restart:  on-failure
     environment:
       MYSQL_ROOT_PASSWORD: ${DATABASE_PASSWORD}