Merge branch 'fix-moodle-version-lang-noupgrade' into 'develop'

Moodle: Fixed version in conf / Parametrized lang in conf / Moved upgrade to Makefile

See merge request isard/isard-apps!13

docker/moodle/02-configure-moodle.sh

@@ -18,7 +18,7 @@ sleep 3;
 # Check if the config.php file exists
 if [ ! -f /var/www/html/config.php ]; then
 
-    curl --location $MOODLE_URL | tar xz --strip-components=1 -C /var/www/html/
+    curl --location https://github.com/moodle/moodle/archive/$MOODLE_VERSION.tar.gz | tar xz --strip-components=1 -C /var/www/html/
     cp /isinstalled.php /var/www/html/admin/cli/
     chown nobody:root /var/www/html -R
 
@@ -34,8 +34,8 @@ if [ ! -f /var/www/html/config.php ]; then
         --dbpass=$DB_PASS \
         --dbport=$DB_PORT \
         --prefix=$DB_PREFIX \
-        --fullname=Dockerized_Moodle \
-        --shortname=moodle \
+        --fullname="$MOODLE_SITENAME" \
+        --shortname="$MOODLE_SHORTSITENAME" \
         --adminuser=$MOODLE_USERNAME \
         --adminpass=$MOODLE_PASSWORD \
         --adminemail=$MOODLE_EMAIL \
@@ -80,11 +80,11 @@ if php -d max_input_vars=1000 /var/www/html/admin/cli/isinstalled.php ; then
     php -d max_input_vars=1000 /var/www/html/admin/cli/cfg.php --name=noreplyaddress --set=$MOODLE_MAIL_NOREPLY_ADDRESS
     php -d max_input_vars=1000 /var/www/html/admin/cli/cfg.php --name=emailsubjectprefix --set=$MOODLE_MAIL_PREFIX
 
-else
-    echo "Upgrading moodle..."
-    php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --enable
-    php -d max_input_vars=1000 /var/www/html/admin/cli/upgrade.php --non-interactive --allow-unstable
-    php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --disable
+# else
+    # echo "Upgrading moodle..."
+    # php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --enable
+    # php -d max_input_vars=1000 /var/www/html/admin/cli/upgrade.php --non-interactive --allow-unstable
+    # php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --disable
 fi
 
 chown -R nobody:root /var/www/html

docker/moodle/Dockerfile

@@ -1,8 +1,12 @@
+ARG LANG=$LANG
+ARG LANGUAGE=$LANGUAGE
+
 ARG ARCH=
 FROM ${ARCH}erseco/alpine-php7-webserver
 
 LABEL maintainer="Adapted from: Ernesto Serrano <info@ernesto.es>"
 
+
 USER root
 COPY src/rootfs/ /
 COPY 02-configure-moodle.sh /docker-entrypoint-init.d/
@@ -16,35 +20,3 @@ RUN echo "group=nobody" >> /etc/php7/php-fpm.d/www.conf
 RUN apk add --no-cache dcron libcap && \
     chown nobody:nobody /usr/sbin/crond && \
     setcap cap_setgid=ep /usr/sbin/crond
-
-# Change MOODLE_38_STABLE for new versions
-ENV MOODLE_URL=https://github.com/moodle/moodle/archive/MOODLE_310_STABLE.tar.gz \
-    LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    SITE_URL=http://localhost \
-    DB_TYPE=pgsql \
-    DB_HOST=postgres \
-    DB_PORT=5432 \
-    DB_NAME=moodle \
-    DB_USER=moodle \
-    DB_PASS=moodle \
-    DB_PREFIX=mdl_ \
-    SSLPROXY=false \
-    MOODLE_EMAIL=user@example.com \
-    MOODLE_LANGUAGE=en \
-    MOODLE_SITENAME=New-Site \
-    MOODLE_USERNAME=moodleuser \
-    MOODLE_PASSWORD=PLEASE_CHANGEME \
-    SMTP_HOST=smtp.gmail.com \
-    SMTP_PORT=587 \
-    SMTP_USER=your_email@gmail.com \
-    SMTP_PASSWORD=your_password \
-    SMTP_PROTOCOL=tls \
-    MOODLE_MAIL_NOREPLY_ADDRESS=noreply@localhost \
-    MOODLE_MAIL_PREFIX=[moodle] \
-    client_max_body_size=50M \
-    post_max_size=50M \
-    upload_max_filesize=50M \
-    max_input_vars=1000
-
-#RUN curl --location $MOODLE_URL | tar xz --strip-components=1 -C /var/www/html/

docker/moodle/moodle.yml

@@ -14,8 +14,7 @@ services:
     depends_on:
       - isard-apps-postgresql
     environment:
-      - LANG=${LANG}
-      - LANGUAGE:${LANGUAGE}
+      - MOODLE_VERSION=${MOODLE_VERSION}
       - SITE_URL=https://moodle.${DOMAIN}
       - DB_TYPE=pgsql
       - DB_HOST=isard-apps-postgresql
@@ -25,9 +24,10 @@ services:
       - DB_PASS=${MOODLE_POSTGRES_PASSWORD}
       - DB_PREFIX=mdl_
       - SSLPROXY=true
-      - MOODLE_EMAIL=${MOODLE_EMAIL}
-      - MOODLE_LANGUAGE=es
-      - MOODLE_SITENAME=isard-office
+      - MOODLE_EMAIL=${MOODLE_EMAIL} #
+      - MOODLE_LANGUAGE=${LANGUAGE_CODE} #
+      - MOODLE_SITENAME=${TITLE} #
+      - MOODLE_SHORTSITENAME=${TITLE_SHORT} #
       - MOODLE_USERNAME=${MOODLE_ADMIN_USER}
       - MOODLE_PASSWORD=${MOODLE_ADMIN_PASSWORD}
       - SMTP_HOST=${SMTP_HOST}
@@ -37,6 +37,10 @@ services:
       - SMTP_PROTOCOL=${SMTP_PROTOCOL}
       - MOODLE_MAIL_NOREPLY_ADDRESS=${MOODLE_MAIL_NOREPLY_ADDRESS}
       - MOODLE_MAIL_PREFIX=${MOODLE_MAIL_PREFIX}
+      - client_max_body_size=${MOODLE_MAX_FILESIZE_UPLOAD}
+      - post_max_size=${MOODLE_MAX_FILESIZE_UPLOAD}
+      - upload_max_filesize=${MOODLE_MAX_FILESIZE_UPLOAD}
+      - max_input_vars=1000
     networks:
       - isard_net