upgrade moodle

Author: qiaofeng1227

apps/moodle/.env

@@ -1,30 +1,16 @@
 W9_POWER_PASSWORD='mCjG5CnUKA!GsOXK'
-W9_VERSION='5.0'
+W9_VERSION='5.1.1'
 W9_DIST='community'
-W9_REPO=bitnamilegacy/moodle
+W9_REPO=websoft9dev/moodle
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
 W9_ID='moodle'
-W9_HTTP_PORT=8080
+W9_HTTP_PORT=80
 W9_HTTP_PORT_SET='9001'
 W9_URL='appname.example.com'
-W9_LOGIN_USER=admin
-W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
+W9_URL_REPLACE=true
 W9_DB_EXPOSE="mariadb"
 W9_MARIADB_VERSION="11.4"
 W9_DIST='community'
 W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
-
-
-# below envs is from Bitnami Moodle
-
-MOODLE_EMAIL=user@example.com
-PHP_ENABLE_OPCACHE=true
-PHP_MAX_EXECUTION_TIME=300
-PHP_MAX_INPUT_TIME=800
-# if set this param, moodle container always restart
-#PHP_MAX_INPUT_VARS=2000
-PHP_MEMORY_LIMIT=600M
-PHP_POST_MAX_SIZE=900M
-PHP_UPLOAD_MAX_FILESIZE=900M

apps/moodle/docker-compose-custom.yml

@@ -1,5 +1,5 @@
-# image: https://hub.docker.com/r/bitnami/moodle
-# compose: https://github.com/bitnami/containers/blob/main/bitnami/moodle/docker-compose.yml
+# Custom Moodle with php:apache base image
+# Official installation guide: https://docs.moodle.org/501/en/Installation_quick_guide
 
 version: "3.8"
 
@@ -9,45 +9,61 @@ services:
     container_name: ${W9_ID}
     restart: unless-stopped
     environment:
-      - ALLOW_EMPTY_PASSWORD=no
-      - MOODLE_DATABASE_HOST=${W9_ID}-mariadb
-      - MOODLE_DATABASE_PORT_NUMBER=3306
-      - MOODLE_DATABASE_USER=moodle
-      - MOODLE_DATABASE_PASSWORD=${W9_POWER_PASSWORD}
-      - MOODLE_DATABASE_NAME=moodle
-      - MOODLE_USERNAME=${W9_LOGIN_USER}
-      - MOODLE_PASSWORD=${W9_LOGIN_PASSWORD}
+      # Database configuration
+      - MOODLE_DB_TYPE=mariadb
+      - MOODLE_DB_HOST=${W9_ID}-mariadb
+      - MOODLE_DB_PORT=3306
+      - MOODLE_DB_NAME=moodle
+      - MOODLE_DB_USER=moodle
+      - MOODLE_DB_PASSWORD=${W9_POWER_PASSWORD}
+      # Site configuration
+      - MOODLE_URL=http://${W9_URL}
+      - MOODLE_SITE_NAME=Moodle Learning Platform
+      - MOODLE_SITE_SHORT=Moodle
+      # Admin account
+      - MOODLE_ADMIN_USER=${W9_LOGIN_USER}
+      - MOODLE_ADMIN_PASSWORD=${W9_LOGIN_PASSWORD}
+      - MOODLE_ADMIN_EMAIL=${MOODLE_EMAIL}
+      # Data directory
+      - MOODLE_DATA=/var/moodledata
     ports:
-      - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}"
-    env_file:
-      - .env
+      - "${W9_HTTP_PORT_SET}:80"
     volumes:
-      - "moodle_data:/bitnami/moodle"
-      - "moodledata_data:/bitnami/moodledata"
+      - moodle_html:/var/www/html
+      - moodle_data:/var/moodledata
     depends_on:
-      - mariadb
+      mariadb:
+        condition: service_healthy
 
   mariadb:
-    image: bitnamilegacy/mariadb:$W9_MARIADB_VERSION
+    image: mariadb:${W9_MARIADB_VERSION}
     container_name: ${W9_ID}-mariadb
     restart: unless-stopped
     environment:
-      - ALLOW_EMPTY_PASSWORD=no
-      - MARIADB_USER=moodle
-      - MARIADB_PASSWORD=${W9_POWER_PASSWORD}
-      - MARIADB_ROOT_PASSWORD=${W9_POWER_PASSWORD}
-      - MARIADB_DATABASE=moodle
-      - MARIADB_CHARACTER_SET=utf8mb4
-      - MARIADB_COLLATE=utf8mb4_unicode_ci
+      - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWORD}
+      - MYSQL_DATABASE=moodle
+      - MYSQL_USER=moodle
+      - MYSQL_PASSWORD=${W9_POWER_PASSWORD}
+    command: >
+      --character-set-server=utf8mb4
+      --collation-server=utf8mb4_unicode_ci
+      --max_allowed_packet=512M
+      --innodb_buffer_pool_size=512M
+      --innodb_log_file_size=256M
     volumes:
-      - "mariadb_data:/bitnami/mariadb"
-
+      - mariadb_data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      
 volumes:
-  mariadb_data:
+  moodle_html:
   moodle_data:
-  moodledata_data:
+  mariadb_data:
 
 networks:
   default:
     name: ${W9_NETWORK}
-    external: true
+    external: true

apps/moodle/docker-compose.yml

@@ -7,7 +7,7 @@
   "edition": [
     {
       "dist": "community",
-      "version": ["5.0","latest"]
+      "version": ["5.1.1","latest"]
     }
   ],
   "requirements": {