From 49f11dd3a0af5ca9d516e459cc203d9d1959f796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Thu, 10 Mar 2022 19:00:54 +0100 Subject: [PATCH 1/3] fix: upgrade exim-relay SMTP image to make it work on arm64 Close #600. --- CHANGELOG.md | 1 + tutor/templates/config/defaults.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c629b70..219fb2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ 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`. ## v13.1.5 (2022-02-14) diff --git a/tutor/templates/config/defaults.yml b/tutor/templates/config/defaults.yml index 7edc9b5..4b148c3 100644 --- a/tutor/templates/config/defaults.yml +++ b/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 From 6393de9862f7aa858e8282ac76bf4958ae5254da Mon Sep 17 00:00:00 2001 From: Emad Rad Date: Fri, 11 Mar 2022 17:54:32 +0330 Subject: [PATCH 2/3] dockerfile patch added in the minimal section --- tutor/templates/build/openedx/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 73cf526..07360f1 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/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 From dde22f3832d6e72248874a4440c2fb02119fd925 Mon Sep 17 00:00:00 2001 From: Emad Rad Date: Mon, 14 Mar 2022 15:55:32 +0330 Subject: [PATCH 3/3] openedx-dockerfile-minimal added --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 219fb2b..d5891e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Note: Breaking changes between versions are indicated by "💥". - [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)