From a52bdf26140a6fddeb149df0c58542c23cbd74e1 Mon Sep 17 00:00:00 2001 From: Florian Haas Date: Fri, 4 Oct 2024 10:04:05 +0200 Subject: [PATCH 1/2] fix: Bump MongoDB client repo to Jammy Now that the base image is on Ubuntu Jammy, we must also bump the MongoDB client repository reference. --- tutorbackup/templates/backup/build/backup/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorbackup/templates/backup/build/backup/Dockerfile b/tutorbackup/templates/backup/build/backup/Dockerfile index c7c5f10..3dfed3e 100644 --- a/tutorbackup/templates/backup/build/backup/Dockerfile +++ b/tutorbackup/templates/backup/build/backup/Dockerfile @@ -4,7 +4,7 @@ ENV PYTHONUNBUFFERED 1 RUN apt-get update && \ apt-get install -y curl gnupg RUN curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | gpg --dearmor > /usr/share/keyrings/mongodb-ce-archive-keyring.gpg && \ - echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-ce-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \ + echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-ce-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \ apt-get update && \ apt-get install -y --no-install-recommends mysql-client-8.0 mongodb-org-tools python3-pip python3-venv python-is-python3 RUN python3 -m venv /s3/venv/ From 934e6fe3b52689c22ebbbc87e1b998e3dec7db58 Mon Sep 17 00:00:00 2001 From: Florian Haas Date: Fri, 4 Oct 2024 10:04:05 +0200 Subject: [PATCH 2/2] fix: Bump MongoDB client repo to version 7.0 To match what Tutor uses for Redwood, go with version 7.0 of the MongoDB client. --- tutorbackup/templates/backup/build/backup/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorbackup/templates/backup/build/backup/Dockerfile b/tutorbackup/templates/backup/build/backup/Dockerfile index 3dfed3e..9f212ec 100644 --- a/tutorbackup/templates/backup/build/backup/Dockerfile +++ b/tutorbackup/templates/backup/build/backup/Dockerfile @@ -3,8 +3,8 @@ ENV PYTHONUNBUFFERED 1 RUN apt-get update && \ apt-get install -y curl gnupg -RUN curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | gpg --dearmor > /usr/share/keyrings/mongodb-ce-archive-keyring.gpg && \ - echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-ce-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \ +RUN curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | gpg --dearmor > /usr/share/keyrings/mongodb-ce-archive-keyring.gpg && \ + echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-ce-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list && \ apt-get update && \ apt-get install -y --no-install-recommends mysql-client-8.0 mongodb-org-tools python3-pip python3-venv python-is-python3 RUN python3 -m venv /s3/venv/