Răsfoiți Sursa

[CE/SP] Hotfix 5.5.7/6.0.1 (#29621)

Addresses docker configuration issues

Updates min mongo version checks in 6.0.1

GitOrigin-RevId: 7d799614520fb681f3641d47f2a6af3c2a09a1a8
Miguel Serrano 10 luni în urmă
părinte
comite
fb8d45d1f0

+ 6 - 0
server-ce/hotfix/5.5.7/Dockerfile

@@ -0,0 +1,6 @@
+FROM sharelatex/sharelatex:5.5.6
+
+# Apply security updates to base image
+RUN apt update && apt install -y linux-libc-dev \
+  && unattended-upgrade --verbose --no-minimal-upgrade-steps \
+  && rm -rf /var/lib/apt/lists/*

+ 10 - 0
server-ce/hotfix/6.0.1/Dockerfile

@@ -0,0 +1,10 @@
+FROM sharelatex/sharelatex:6.0.0
+
+# Apply security updates to base image
+RUN apt update && apt install -y linux-libc-dev \
+  && unattended-upgrade --verbose --no-minimal-upgrade-steps \
+  && rm -rf /var/lib/apt/lists/*
+
+# Update mongo compatibility versions
+COPY mongo-version.patch .
+RUN patch -p1 < mongo-version.patch && rm mongo-version.patch

+ 13 - 0
server-ce/hotfix/6.0.1/mongo-version.patch

@@ -0,0 +1,13 @@
+--- a/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
++++ b/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
+@@ -6,8 +6,8 @@ import {
+ 
+ const { ObjectId } = mongodb
+ 
+-const MIN_MONGO_VERSION = [6, 0]
+-const MIN_MONGO_FEATURE_COMPATIBILITY_VERSION = [6, 0]
++const MIN_MONGO_VERSION = [8, 0]
++const MIN_MONGO_FEATURE_COMPATIBILITY_VERSION = [7, 0]
+ 
+ // Allow ignoring admin check failures via an environment variable
+ const OVERRIDE_ENV_VAR_NAME = 'ALLOW_MONGO_ADMIN_CHECK_FAILURES'

+ 2 - 2
services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs

@@ -6,8 +6,8 @@ import {
 
 const { ObjectId } = mongodb
 
-const MIN_MONGO_VERSION = [6, 0]
-const MIN_MONGO_FEATURE_COMPATIBILITY_VERSION = [6, 0]
+const MIN_MONGO_VERSION = [8, 0]
+const MIN_MONGO_FEATURE_COMPATIBILITY_VERSION = [7, 0]
 
 // Allow ignoring admin check failures via an environment variable
 const OVERRIDE_ENV_VAR_NAME = 'ALLOW_MONGO_ADMIN_CHECK_FAILURES'