From 6f87cc2d81962b891b16dd8de98bf9c0e4758ddd Mon Sep 17 00:00:00 2001 From: Julian Kleinhans Date: Wed, 8 May 2024 09:06:09 +0200 Subject: [PATCH] Add DB support for MariaDB version 10.11 (#495) Co-authored-by: Julian Kleinhans --- README.md | 77 ++++++++++--------- docs/06-configuring-services.md | 2 +- .../dev/services.deploy.template.yml | 2 +- .../mysql/mariadb-10.11/mysql.yml.twig | 19 +++++ 4 files changed, 60 insertions(+), 40 deletions(-) create mode 100644 generator/src/templates/service/mysql/mariadb-10.11/mysql.yml.twig diff --git a/README.md b/README.md index 20cace931..ca3aa1a6b 100644 --- a/README.md +++ b/README.md @@ -54,41 +54,42 @@ For contribution guidelines, see [Code contribution guide](https://docs.spryker. ## Supported services -| Service | Engine | Version(s) | ARM support | Note | -|-----------------|--------------|--------------|-------------|------------------------------------| -| database | postgres | 9.6* | ✓ | | -| | | 10 | ✓ | | -| | | 11 | ✓ | | -| | | 12 | ✓ | | -| | mysql | 5.7 | | | -| | | mariadb-10.2 | ✓ | https://endoflife.date/mariadb | -| | | mariadb-10.3 | ✓ | https://endoflife.date/mariadb | -| | | mariadb-10.4 | ✓ | | -| | | mariadb-10.5 | ✓ | | -| | | mariadb-10.6 | ✓ | | -| broker | rabbitmq | 3.7 | | | -| | | 3.8 | ✓ | | -| | | 3.9 | ✓ | | -| session | redis | 5.0* | ✓ | | -| | redis | 6.2 | ✓ | | -| key_value_store | redis | 5.0* | ✓ | | -| | redis | 6.2 | ✓ | | -| search | elastic | 5.6* | ✓ | https://www.elastic.co/support/eol | -| | | 6.8 | ✓ | https://www.elastic.co/support/eol | -| | | 7.6 | ✓ | | -| | | 7.10 | ✓ | | -| | opensearch | 1.3 | ✓ | | -| scheduler | jenkins | 2.176 | | | -| | | 2.305 | ✓ | | -| | | 2.324 | ✓ | | -| | | 2.401 | ✓ | | -| | | 2.442 | ✓ | | -| webdriver | phantomjs | latest* | | | -| | chromedriver | latest | ✓ | | -| mail_catcher | mailhog | 1.0 | ✓ | | -| swagger | swagger-ui | v3.24 | ✓ | | -| kibana | kibana | 5.6* | ✓ | https://www.elastic.co/support/eol | -| | | 6.8 | ✓ | https://www.elastic.co/support/eol | -| | | 7.6 | ✓ | | -| | | 7.10 | ✓ | | -| blackfire | blackfire | latest | ✓ | | +| Service | Engine | Version(s) | ARM support | Note | +|-----------------|--------------|---------------|-------------|------------------------------------| +| database | postgres | 9.6* | ✓ | | +| | | 10 | ✓ | | +| | | 11 | ✓ | | +| | | 12 | ✓ | | +| | mysql | 5.7 | | | +| | | mariadb-10.2 | ✓ | https://endoflife.date/mariadb | +| | | mariadb-10.3 | ✓ | https://endoflife.date/mariadb | +| | | mariadb-10.4 | ✓ | | +| | | mariadb-10.5 | ✓ | | +| | | mariadb-10.6 | ✓ | | +| | | mariadb-10.11 | ✓ | | +| broker | rabbitmq | 3.7 | | | +| | | 3.8 | ✓ | | +| | | 3.9 | ✓ | | +| session | redis | 5.0* | ✓ | | +| | redis | 6.2 | ✓ | | +| key_value_store | redis | 5.0* | ✓ | | +| | redis | 6.2 | ✓ | | +| search | elastic | 5.6* | ✓ | https://www.elastic.co/support/eol | +| | | 6.8 | ✓ | https://www.elastic.co/support/eol | +| | | 7.6 | ✓ | | +| | | 7.10 | ✓ | | +| | opensearch | 1.3 | ✓ | | +| scheduler | jenkins | 2.176 | | | +| | | 2.305 | ✓ | | +| | | 2.324 | ✓ | | +| | | 2.401 | ✓ | | +| | | 2.442 | ✓ | | +| webdriver | phantomjs | latest* | | | +| | chromedriver | latest | ✓ | | +| mail_catcher | mailhog | 1.0 | ✓ | | +| swagger | swagger-ui | v3.24 | ✓ | | +| kibana | kibana | 5.6* | ✓ | https://www.elastic.co/support/eol | +| | | 6.8 | ✓ | https://www.elastic.co/support/eol | +| | | 7.6 | ✓ | | +| | | 7.10 | ✓ | | +| blackfire | blackfire | latest | ✓ | | diff --git a/docs/06-configuring-services.md b/docs/06-configuring-services.md index 113a9ec08..87d1d02c6 100644 --- a/docs/06-configuring-services.md +++ b/docs/06-configuring-services.md @@ -62,7 +62,7 @@ Follow the steps below to switch the database service to MariaDB: services: database: engine: mysql - version: mariadb-10.4 + version: mariadb-10.11 ... endpoints: localhost:3306: diff --git a/generator/deploy-file-generator/templates/environment/dev/services.deploy.template.yml b/generator/deploy-file-generator/templates/environment/dev/services.deploy.template.yml index fab913957..745b7c23f 100644 --- a/generator/deploy-file-generator/templates/environment/dev/services.deploy.template.yml +++ b/generator/deploy-file-generator/templates/environment/dev/services.deploy.template.yml @@ -1,7 +1,7 @@ services: database: engine: mysql - version: mariadb-10.4 + version: mariadb-10.11 endpoints: localhost:3306: protocol: tcp diff --git a/generator/src/templates/service/mysql/mariadb-10.11/mysql.yml.twig b/generator/src/templates/service/mysql/mariadb-10.11/mysql.yml.twig new file mode 100644 index 000000000..67dcb36cc --- /dev/null +++ b/generator/src/templates/service/mysql/mariadb-10.11/mysql.yml.twig @@ -0,0 +1,19 @@ + {{ serviceName }}: + image: mariadb:10.11 + networks: + - private + labels: + 'spryker.app.name': database + 'spryker.app.type': services + 'spryker.project': ${SPRYKER_DOCKER_PREFIX}:${SPRYKER_DOCKER_TAG} + healthcheck: + test: ["CMD", "mysqladmin", "ping", "--silent"] + interval: 10s + timeout: 10s + retries: 5 + environment: + MYSQL_ROOT_PASSWORD: "{{ serviceData['root']['password'] }}" + LANG: C.UTF-8 + volumes: + - {{ serviceName }}-{{ serviceData['engine'] }}-data:/var/lib/mysql:rw + - ./${DEPLOYMENT_PATH}/context/mysql/my.cnf:/etc/mysql/mariadb.conf.d/my.cnf:ro