From c56df51f6ea48ee77cf90d2c688a35565651488a Mon Sep 17 00:00:00 2001 From: Simon Chester Date: Mon, 29 Jan 2024 17:07:59 +1300 Subject: [PATCH 1/4] Upgrade to Node.js v20 LTS --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4f520ab..4db28ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: # docker-compose -f docker-compose.yml -f compose/nginx.yml -f compose/pgsql.yml -f compose/php.yml up -d pgsql php-7.3 nodejs: - image: node:16 + image: node:20 container_name: totara_nodejs environment: TZ: ${TIME_ZONE} From ccca93d953792985143780db042b95a21ceb26e9 Mon Sep 17 00:00:00 2001 From: Cody Finegan Date: Fri, 10 May 2024 15:30:41 +1200 Subject: [PATCH 2/4] Adding PostgreSQL 16 --- README.md | 2 +- compose/pgsql.yml | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 775b2af..0ee50d9 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Although this project started as a development environment for Totara Learn it c * [NGINX](https://nginx.org/) as a webserver * [Apache](https://httpd.apache.org/) as a webserver * [PHP](http://php.net/) 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3 to test for different versions - * [PostgreSQL](https://www.postgresql.org/) (9.3, 9.6, 10, 11, 12, 13, 14, 15), + * [PostgreSQL](https://www.postgresql.org/) (9.3, 9.6, 10, 11, 12, 13, 14, 15, 16), * [MariaDB](https://mariadb.org/) (10.2, 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.11), * [MySQL](https://www.mysql.com/) (5.7, 8), * Microsoft SQL Server ([2017](https://www.microsoft.com/en-us/sql-server/sql-server-2017), [2019](https://www.microsoft.com/en-us/sql-server/sql-server-2019)) diff --git a/compose/pgsql.yml b/compose/pgsql.yml index 6b99708..3b9db57 100644 --- a/compose/pgsql.yml +++ b/compose/pgsql.yml @@ -149,6 +149,25 @@ services: networks: - totara + pgsql16: + image: postgres:16-alpine + container_name: totara_pgsql16 + ports: + - "5445:5432" + environment: + TZ: ${TIME_ZONE} + PGDATA: /var/lib/postgresql/data/pgdata + POSTGRES_HOST_AUTH_METHOD: trust + command: + postgres -c 'config_file=/etc/postgresql/postgresql.conf' + volumes: + - ./pgsql/my-postgres.conf:/etc/postgresql/postgresql.conf + - pgsql16-data:/var/lib/postgresql/data + depends_on: + - nginx + networks: + - totara + volumes: pgsql93-data: pgsql96-data: @@ -158,3 +177,4 @@ volumes: pgsql13-data: pgsql14-data: pgsql15-data: + pgsql16-data: From 8ecabb5ba69a5ce67faca044ca663f76a8a9381b Mon Sep 17 00:00:00 2001 From: Cody Finegan Date: Fri, 10 May 2024 15:33:11 +1200 Subject: [PATCH 3/4] Adding MySQL 8.4 --- README.md | 2 +- compose/mysql.yml | 17 +++++++++++++++++ mysql84/my.cnf | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 mysql84/my.cnf diff --git a/README.md b/README.md index 0ee50d9..8d2004f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Although this project started as a development environment for Totara Learn it c * [PHP](http://php.net/) 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3 to test for different versions * [PostgreSQL](https://www.postgresql.org/) (9.3, 9.6, 10, 11, 12, 13, 14, 15, 16), * [MariaDB](https://mariadb.org/) (10.2, 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.11), - * [MySQL](https://www.mysql.com/) (5.7, 8), + * [MySQL](https://www.mysql.com/) (5.7, 8.0, 8.4), * Microsoft SQL Server ([2017](https://www.microsoft.com/en-us/sql-server/sql-server-2017), [2019](https://www.microsoft.com/en-us/sql-server/sql-server-2019)) * [NodeJS](https://nodejs.org/) for building, developing and testing frontend code * A [PHPUnit](https://phpunit.de/) and [Behat](http://behat.org/en/latest/) setup to run tests (including [Selenium](https://www.seleniumhq.org/)) diff --git a/compose/mysql.yml b/compose/mysql.yml index 1b4046e..110ba34 100644 --- a/compose/mysql.yml +++ b/compose/mysql.yml @@ -17,6 +17,22 @@ services: networks: - totara + mysql84: + image: mysql:8.4 + container_name: totara_mysql84 + ports: + - "3309:3306" + environment: + TZ: ${TIME_ZONE} + MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PW} + depends_on: + - nginx + volumes: + - mysql84-data:/var/lib/mysql + - ./mysql84:/etc/mysql/conf.d + networks: + - totara + mysql57: # MySQL 5.7 does not support multiple architectures. (MySQL 8.0 works fine) platform: linux/amd64 @@ -37,3 +53,4 @@ services: volumes: mysql-data: mysql80-data: + mysql84-data: diff --git a/mysql84/my.cnf b/mysql84/my.cnf new file mode 100644 index 0000000..b41cc0c --- /dev/null +++ b/mysql84/my.cnf @@ -0,0 +1,2 @@ +[mysqld] +mysql_native_password=ON From 4689f9674bc13463f9d94c109a3d16926b86a840 Mon Sep 17 00:00:00 2001 From: Laszlo Zaborski Date: Tue, 16 Apr 2024 17:19:06 +0100 Subject: [PATCH 4/4] Remove deprecated version lines from yml. --- compose/apache.yml | 1 - compose/build.yml | 1 - compose/machine-learning.yml | 1 - compose/mariadb.yml | 1 - compose/mssql.yml | 1 - compose/mysql.yml | 1 - compose/nginx.yml | 1 - compose/pgsql.yml | 1 - compose/php.yml | 1 - compose/selenium.yml | 1 - compose/sync.yml | 1 - custom/example.yml.dist | 1 - docker-compose.yml | 1 - 13 files changed, 13 deletions(-) diff --git a/compose/apache.yml b/compose/apache.yml index 359b112..fc8acb5 100644 --- a/compose/apache.yml +++ b/compose/apache.yml @@ -1,4 +1,3 @@ -version: "3.7" services: apache: diff --git a/compose/build.yml b/compose/build.yml index afd125a..a191fff 100644 --- a/compose/build.yml +++ b/compose/build.yml @@ -1,4 +1,3 @@ -version: "3.7" services: apache: diff --git a/compose/machine-learning.yml b/compose/machine-learning.yml index 4570736..cd91205 100644 --- a/compose/machine-learning.yml +++ b/compose/machine-learning.yml @@ -1,4 +1,3 @@ -version: "3.7" services: ml-service: build: diff --git a/compose/mariadb.yml b/compose/mariadb.yml index ccf2c15..ac1e5ec 100644 --- a/compose/mariadb.yml +++ b/compose/mariadb.yml @@ -1,4 +1,3 @@ -version: "3.7" services: mariadb1011: diff --git a/compose/mssql.yml b/compose/mssql.yml index ccd2184..368547d 100644 --- a/compose/mssql.yml +++ b/compose/mssql.yml @@ -1,4 +1,3 @@ -version: "3.7" services: mssql2017: diff --git a/compose/mysql.yml b/compose/mysql.yml index 110ba34..c73637a 100644 --- a/compose/mysql.yml +++ b/compose/mysql.yml @@ -1,4 +1,3 @@ -version: "3.7" services: mysql8: diff --git a/compose/nginx.yml b/compose/nginx.yml index 3e7a182..cf80da9 100644 --- a/compose/nginx.yml +++ b/compose/nginx.yml @@ -1,4 +1,3 @@ -version: "3.7" services: nginx: diff --git a/compose/pgsql.yml b/compose/pgsql.yml index 3b9db57..6eedfff 100644 --- a/compose/pgsql.yml +++ b/compose/pgsql.yml @@ -1,4 +1,3 @@ -version: "3.7" services: pgsql93: diff --git a/compose/php.yml b/compose/php.yml index a4974a7..e2b355c 100644 --- a/compose/php.yml +++ b/compose/php.yml @@ -1,4 +1,3 @@ -version: "3.7" services: php-5.3: diff --git a/compose/selenium.yml b/compose/selenium.yml index 9c20452..e0a99c3 100644 --- a/compose/selenium.yml +++ b/compose/selenium.yml @@ -1,4 +1,3 @@ -version: "3.7" services: selenium-hub: diff --git a/compose/sync.yml b/compose/sync.yml index 7aa806f..313e1c2 100644 --- a/compose/sync.yml +++ b/compose/sync.yml @@ -1,4 +1,3 @@ -version: "3.7" services: nginx: diff --git a/custom/example.yml.dist b/custom/example.yml.dist index 974f142..efee012 100644 --- a/custom/example.yml.dist +++ b/custom/example.yml.dist @@ -1,5 +1,4 @@ # Example compose file override -version: "3.7" services: nginx: diff --git a/docker-compose.yml b/docker-compose.yml index 4db28ec..f0711b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.7" services: # this file only contains a small part of the container definitions