Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.15.0 #311

Merged
merged 7 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .env.dist
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ LOCAL_SRC=/your/totara/src/path
# Note that specifying just 'php' will automatically use the latest version of PHP that the Totara site supports
DEFAULT_CONTAINERS=nginx,pgsql13,php

# Set the restart policy for containers
# If set to 'no', containers will only start when you manually start them via `tup`
# If set to 'unless-stopped', containers will restart upon rebooting/crashing
RESTART_POLICY=unless-stopped

# set this to your local IP address
# for mac just use "host.docker.internal"
# for linux run command "docker run --rm alpine ip -4 route list match 0/0 | cut -d' ' -f3" and use the resulting ip address
Expand All @@ -20,13 +25,12 @@ HOST_IP=host.docker.internal
# If not specified tdb will use the folder "tdb_backup" in your home directory
#TDB_BACKUP_PATH=/your/path/to/backup/location

# Set this to a region close to you for better page loading times when using ngrok
# Available ngrok regions: us (Ohio), eu (Frankfurt), ap (Singapore), au (Sydney), sa (Sao Paulo), jp (Tokyo), in (Mumbai)
NGROK_REGION=au

# Set your preferred shell (used by things like tphp). bash and zsh are available.
INTERACTIVE_SHELL=zsh

# Uncomment this to use mutagen on MacOS (to speed up docker volume syncing)
#USE_MUTAGEN=1

# Build settings (this will have an affect on build only)
TIME_ZONE=Pacific/Auckland

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [73, 74, 80, 81, 82, 83]
version: [73, 74, 80, 81, 82, 83, 84]
with:
version: ${{ matrix.version }}
secrets: inherit
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.use-mutagen
use-mutagen
mutagen.yml.lock
.env
!.gitkeep
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ Although this project started as a development environment for Totara Learn it c
### What You Get
* [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
* [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, 8.4 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, 11.4),
* [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), [2022](https://www.microsoft.com/en-us/sql-server/sql-server-2022))
* [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/))
* A [mailcatcher](https://mailcatcher.me/) instance to view sent emails
* A [MailDev](https://github.com/maildev/maildev?tab=readme-ov-file#maildev) instance to view sent emails
* [Redis](https://redis.io/) for caching and/or session handling
* [XHProf](https://github.com/tideways/php-xhprof-extension) for profiling
* [XDebug](https://xdebug.org/) installed, ready for debugging with your favorite IDE
Expand Down
2 changes: 1 addition & 1 deletion bin/tdb
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ if [ "$db_type" == 'pgsql' ]; then
$db_command dropdb -U "$db_user" --if-exists "$db_name"
$db_command createdb -U "$db_user" -T template1 -E UTF-8 "$db_name"
if [ "$for_totara_box" == "1" ]; then
$db_command pg_restore -d "$db_name" -U "$db_user" "$backup_file_remote" >> /dev/null
$db_command pg_restore --no-owner --no-privileges -d "$db_name" -U "$db_user" "$backup_file_remote" >> /dev/null
else
$db_command psql -U "$db_user" --dbname "$db_name" -f "$backup_file_remote" >> /dev/null
fi
Expand Down
6 changes: 1 addition & 5 deletions bin/tngrok
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,8 @@ Usage Examples:
exit;
fi

if [ -z $NGROK_REGION ]; then
NGROK_REGION="us"
fi

if [ ! -z $2 ]; then
subdomain="-subdomain=$2"
fi

ngrok http --region=$NGROK_REGION $subdomain --host-header=rewrite "https://$1:8443"
ngrok http $subdomain --host-header=rewrite "https://$1:8443"
3 changes: 2 additions & 1 deletion compose/apache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ services:
apache:
image: totara/docker-dev-apache
container_name: totara_apache
restart: ${RESTART_POLICY:-no}
environment:
- TZ=${TIME_ZONE}
- REMOTE_DATA
Expand All @@ -15,7 +16,7 @@ services:
- ${LOCAL_SRC}:${REMOTE_SRC}
- totara-data:${REMOTE_DATA}
depends_on:
- mailcatcher
- maildev
networks:
totara:
aliases:
Expand Down
12 changes: 12 additions & 0 deletions compose/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,15 @@ services:
php-8.3-debug:
build: ./php/php83-debug

php-8.4:
build:
context: ./php/php84
args:
TIME_ZONE: ${TIME_ZONE}

php-8.4-cron:
build: ./php/php84-cron

php-8.4-debug:
build: ./php/php84-debug

1 change: 1 addition & 0 deletions compose/machine-learning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ services:
build:
context: ${ML_TOTARA_PROJECT:?Set the path to your Totara project}/extensions/ml_service
target: mlbase
restart: ${RESTART_POLICY:-no}
init: true
pull_policy: build
environment:
Expand Down
9 changes: 9 additions & 0 deletions compose/mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ services:
mariadb1104:
image: mariadb:11.4
container_name: totara_mariadb1104
restart: ${RESTART_POLICY:-no}
ports:
- "3316:3306"
environment:
Expand All @@ -19,6 +20,7 @@ services:
mariadb1011:
image: mariadb:10.11
container_name: totara_mariadb1011
restart: ${RESTART_POLICY:-no}
ports:
- "3315:3306"
environment:
Expand All @@ -35,6 +37,7 @@ services:
mariadb108:
image: mariadb:10.8
container_name: totara_mariadb108
restart: ${RESTART_POLICY:-no}
ports:
- "3312:3306"
environment:
Expand All @@ -51,6 +54,7 @@ services:
mariadb107:
image: mariadb:10.7
container_name: totara_mariadb107
restart: ${RESTART_POLICY:-no}
ports:
- "3311:3306"
environment:
Expand All @@ -67,6 +71,7 @@ services:
mariadb106:
image: mariadb:10.6
container_name: totara_mariadb106
restart: ${RESTART_POLICY:-no}
ports:
- "3310:3306"
environment:
Expand All @@ -83,6 +88,7 @@ services:
mariadb105:
image: mariadb:10.5
container_name: totara_mariadb105
restart: ${RESTART_POLICY:-no}
ports:
- "3307:3306"
environment:
Expand All @@ -99,6 +105,7 @@ services:
mariadb104:
image: mariadb:10.4
container_name: totara_mariadb104
restart: ${RESTART_POLICY:-no}
ports:
- "3309:3306"
environment:
Expand All @@ -115,6 +122,7 @@ services:
mariadb103:
image: mariadb:10.3
container_name: totara_mariadb103
restart: ${RESTART_POLICY:-no}
ports:
- "3305:3306"
environment:
Expand All @@ -131,6 +139,7 @@ services:
mariadb102:
image: mariadb:10.2
container_name: totara_mariadb102
restart: ${RESTART_POLICY:-no}
ports:
- "3302:3306"
environment:
Expand Down
3 changes: 3 additions & 0 deletions compose/mssql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ services:
# Mssql does not support multiple architectures
platform: linux/amd64
container_name: totara_mssql
restart: ${RESTART_POLICY:-no}
ports:
- "1433:1433"
environment:
Expand All @@ -24,6 +25,7 @@ services:
# Mssql does not support multiple architectures
platform: linux/amd64
container_name: totara_mssql2019
restart: ${RESTART_POLICY:-no}
ports:
- "1419:1433"
environment:
Expand All @@ -43,6 +45,7 @@ services:
# Mssql does not support multiple architectures
platform: linux/amd64
container_name: totara_mssql2022
restart: ${RESTART_POLICY:-no}
ports:
- "1420:1433"
environment:
Expand Down
3 changes: 3 additions & 0 deletions compose/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ services:
mysql8:
image: mysql:8.0
container_name: totara_mysql8
restart: ${RESTART_POLICY:-no}
ports:
- "3308:3306"
environment:
Expand All @@ -19,6 +20,7 @@ services:
mysql84:
image: mysql:8.4
container_name: totara_mysql84
restart: ${RESTART_POLICY:-no}
ports:
- "3309:3306"
environment:
Expand All @@ -37,6 +39,7 @@ services:
platform: linux/amd64
image: mysql:5.7
container_name: totara_mysql57
restart: ${RESTART_POLICY:-no}
ports:
- "3306:3306"
environment:
Expand Down
3 changes: 2 additions & 1 deletion compose/nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ services:
nginx:
image: totara/docker-dev-nginx
container_name: totara_nginx
restart: ${RESTART_POLICY:-no}
environment:
- TZ=${TIME_ZONE}
- REMOTE_DATA
Expand All @@ -15,7 +16,7 @@ services:
- ${LOCAL_SRC}:${REMOTE_SRC}
- totara-data:${REMOTE_DATA}
depends_on:
- mailcatcher
- maildev
networks:
totara:
aliases:
Expand Down
9 changes: 9 additions & 0 deletions compose/pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ services:
pgsql93:
image: postgres:9.3-alpine
container_name: totara_pgsql93
restart: ${RESTART_POLICY:-no}
ports:
- "5493:5432"
environment:
Expand All @@ -21,6 +22,7 @@ services:
pgsql96:
image: postgres:9.6-alpine
container_name: totara_pgsql96
restart: ${RESTART_POLICY:-no}
ports:
- "5496:5432"
environment:
Expand All @@ -40,6 +42,7 @@ services:
pgsql10:
image: postgres:10-alpine
container_name: totara_pgsql10
restart: ${RESTART_POLICY:-no}
ports:
- "5410:5432"
environment:
Expand All @@ -58,6 +61,7 @@ services:
pgsql11:
image: postgres:11-alpine
container_name: totara_pgsql11
restart: ${RESTART_POLICY:-no}
ports:
- "5411:5432"
environment:
Expand All @@ -76,6 +80,7 @@ services:
pgsql12:
image: postgres:12-alpine
container_name: totara_pgsql12
restart: ${RESTART_POLICY:-no}
ports:
- "5432:5432"
environment:
Expand All @@ -94,6 +99,7 @@ services:
pgsql13:
image: postgres:13-alpine
container_name: totara_pgsql13
restart: ${RESTART_POLICY:-no}
ports:
- "5442:5432"
environment:
Expand All @@ -113,6 +119,7 @@ services:
pgsql14:
image: postgres:14-alpine
container_name: totara_pgsql14
restart: ${RESTART_POLICY:-no}
ports:
- "5443:5432"
environment:
Expand All @@ -132,6 +139,7 @@ services:
pgsql15:
image: postgres:15-alpine
container_name: totara_pgsql15
restart: ${RESTART_POLICY:-no}
ports:
- "5444:5432"
environment:
Expand All @@ -151,6 +159,7 @@ services:
pgsql16:
image: postgres:16-alpine
container_name: totara_pgsql16
restart: ${RESTART_POLICY:-no}
ports:
- "5445:5432"
environment:
Expand Down
Loading
Loading