From df4e83b197fd2ff3da10f9da40b3352590d83aaf Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Fri, 6 Oct 2023 12:48:45 +0200 Subject: [PATCH] Merge pull request #15156 from overleaf/msm-hotfix-4-1-3 [CE/SP] Hotfix 4.1.3 / 3.5.13 GitOrigin-RevId: 82d8db6164a197a0427f7b9aedd0a440ab2f71b1 --- server-ce/cron/project-history-retry-soft.sh | 2 +- server-ce/hotfix/3.5.13/Dockerfile | 5 +++++ server-ce/hotfix/3.5.13/history_soft_retry.patch | 8 ++++++++ server-ce/hotfix/4.1.3/Dockerfile | 5 +++++ server-ce/hotfix/4.1.3/history_soft_retry.patch | 8 ++++++++ 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 server-ce/hotfix/3.5.13/Dockerfile create mode 100644 server-ce/hotfix/3.5.13/history_soft_retry.patch create mode 100644 server-ce/hotfix/4.1.3/Dockerfile create mode 100644 server-ce/hotfix/4.1.3/history_soft_retry.patch diff --git a/server-ce/cron/project-history-retry-soft.sh b/server-ce/cron/project-history-retry-soft.sh index 3568648085..32f7bce169 100755 --- a/server-ce/cron/project-history-retry-soft.sh +++ b/server-ce/cron/project-history-retry-soft.sh @@ -8,4 +8,4 @@ echo "-----------------------------------" PROJECT_HISTORY_URL='http://localhost:3054' -curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=hard&timeout=3600000&limit=10000" +curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=soft&timeout=3600000&limit=10000" diff --git a/server-ce/hotfix/3.5.13/Dockerfile b/server-ce/hotfix/3.5.13/Dockerfile new file mode 100644 index 0000000000..0ae5f77eed --- /dev/null +++ b/server-ce/hotfix/3.5.13/Dockerfile @@ -0,0 +1,5 @@ +FROM sharelatex/sharelatex:3.5.12 + +# Patch: fix soft history retry in cron job +COPY history_soft_retry.patch . +RUN patch -p0 < history_soft_retry.patch diff --git a/server-ce/hotfix/3.5.13/history_soft_retry.patch b/server-ce/hotfix/3.5.13/history_soft_retry.patch new file mode 100644 index 0000000000..a28855ff41 --- /dev/null +++ b/server-ce/hotfix/3.5.13/history_soft_retry.patch @@ -0,0 +1,8 @@ +--- cron/project-history-retry-soft.sh ++++ cron/project-history-retry-soft.sh +@@ -8,4 +8,4 @@ echo "-----------------------------------" + + PROJECT_HISTORY_URL='http://localhost:3054' + +-curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=hard&timeout=3600000&limit=10000" ++curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=soft&timeout=3600000&limit=10000" diff --git a/server-ce/hotfix/4.1.3/Dockerfile b/server-ce/hotfix/4.1.3/Dockerfile new file mode 100644 index 0000000000..ed1c9ffb6f --- /dev/null +++ b/server-ce/hotfix/4.1.3/Dockerfile @@ -0,0 +1,5 @@ +FROM sharelatex/sharelatex:4.1.2 + +# Patch: fix soft history retry in cron job +COPY history_soft_retry.patch . +RUN patch -p0 < history_soft_retry.patch diff --git a/server-ce/hotfix/4.1.3/history_soft_retry.patch b/server-ce/hotfix/4.1.3/history_soft_retry.patch new file mode 100644 index 0000000000..a28855ff41 --- /dev/null +++ b/server-ce/hotfix/4.1.3/history_soft_retry.patch @@ -0,0 +1,8 @@ +--- cron/project-history-retry-soft.sh ++++ cron/project-history-retry-soft.sh +@@ -8,4 +8,4 @@ echo "-----------------------------------" + + PROJECT_HISTORY_URL='http://localhost:3054' + +-curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=hard&timeout=3600000&limit=10000" ++curl -X POST "${PROJECT_HISTORY_URL}/retry/failures?failureType=soft&timeout=3600000&limit=10000"