Merge remote-tracking branch 'origin/master' into nightly

CHANGELOG.md

@@ -4,7 +4,9 @@ Note: Breaking changes between versions are indicated by "💥".
 
 ## Unreleased
 
+- [Bugfix] Fix running the default exim-relay SMTP server on arm64 (#600).
 - [Feature] Add `tutor k8s apply` comand, which is a direct interface with `kubectl apply`.
+- [Feature] Add `openedx-dockerfile-minimal` patch, which you can use to install custom packages and run commands as root in the Docker image.
 
 ## v13.1.5 (2022-02-14)
 

tutor/templates/build/openedx/Dockerfile

@@ -6,6 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update && \
     apt install -y build-essential curl git language-pack-en
 ENV LC_ALL en_US.UTF-8
+{{ patch("openedx-dockerfile-minimal") }}
 
 ###### Install python with pyenv in /opt/pyenv and create virtualenv in /openedx/venv
 FROM minimal as python

tutor/templates/config/defaults.yml

@@ -17,7 +17,7 @@ DOCKER_IMAGE_MONGODB: "docker.io/mongo:4.2.17"
 DOCKER_IMAGE_MYSQL: "docker.io/mysql:5.7.35"
 DOCKER_IMAGE_PERMISSIONS: "{{ DOCKER_REGISTRY }}overhangio/openedx-permissions:{{ TUTOR_VERSION }}"
 DOCKER_IMAGE_REDIS: "docker.io/redis:6.2.6"
-DOCKER_IMAGE_SMTP: "docker.io/devture/exim-relay:4.94.2-r0-4"
+DOCKER_IMAGE_SMTP: "docker.io/devture/exim-relay:4.95-r0-2"
 LOCAL_PROJECT_NAME: "{{ TUTOR_APP }}_local"
 ELASTICSEARCH_HOST: "elasticsearch"
 ELASTICSEARCH_PORT: 9200