From 856e1e402576b456ae07265b58a5725b25e18180 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 4 May 2023 09:51:40 +0100 Subject: [PATCH] Merge pull request #12935 from overleaf/jpa-include-patches [misc] make npm package patches available to all the services GitOrigin-RevId: 4e53f8af15f009d5e7c44d00b87b7592b6175541 --- services/chat/Dockerfile | 1 + services/clsi/Dockerfile | 1 + services/contacts/Dockerfile | 1 + services/docstore/Dockerfile | 1 + services/document-updater/Dockerfile | 1 + services/filestore/Dockerfile | 1 + services/history-v1/Dockerfile | 1 + services/notifications/Dockerfile | 1 + services/project-history/Dockerfile | 1 + services/real-time/Dockerfile | 1 + services/spelling/Dockerfile | 1 + services/track-changes/Dockerfile | 1 + 12 files changed, 12 insertions(+) diff --git a/services/chat/Dockerfile b/services/chat/Dockerfile index 87c955871b..bbc775360f 100644 --- a/services/chat/Dockerfile +++ b/services/chat/Dockerfile @@ -15,6 +15,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/chat/package.json /overleaf/services/chat/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/clsi/Dockerfile b/services/clsi/Dockerfile index 1b773d9ad7..b375e988f5 100644 --- a/services/clsi/Dockerfile +++ b/services/clsi/Dockerfile @@ -19,6 +19,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/clsi/package.json /overleaf/services/clsi/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/contacts/Dockerfile b/services/contacts/Dockerfile index 2091a63333..fa769a4d7e 100644 --- a/services/contacts/Dockerfile +++ b/services/contacts/Dockerfile @@ -15,6 +15,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/contacts/package.json /overleaf/services/contacts/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/docstore/Dockerfile b/services/docstore/Dockerfile index 6cdbb3c82f..9dda209ef3 100644 --- a/services/docstore/Dockerfile +++ b/services/docstore/Dockerfile @@ -15,6 +15,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/docstore/package.json /overleaf/services/docstore/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/document-updater/Dockerfile b/services/document-updater/Dockerfile index fd460d5153..f484c461fd 100644 --- a/services/document-updater/Dockerfile +++ b/services/document-updater/Dockerfile @@ -15,6 +15,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/document-updater/package.json /overleaf/services/document-updater/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/filestore/Dockerfile b/services/filestore/Dockerfile index 93d2766e9b..a5a8898ab2 100644 --- a/services/filestore/Dockerfile +++ b/services/filestore/Dockerfile @@ -17,6 +17,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/filestore/package.json /overleaf/services/filestore/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/history-v1/Dockerfile b/services/history-v1/Dockerfile index 6a89ff890a..73253eb9fc 100644 --- a/services/history-v1/Dockerfile +++ b/services/history-v1/Dockerfile @@ -18,6 +18,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/history-v1/package.json /overleaf/services/history-v1/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index e0ced2119c..3d2abcdd32 100644 --- a/services/notifications/Dockerfile +++ b/services/notifications/Dockerfile @@ -15,6 +15,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/notifications/package.json /overleaf/services/notifications/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/project-history/Dockerfile b/services/project-history/Dockerfile index ebce9db91f..72fcb78f9e 100644 --- a/services/project-history/Dockerfile +++ b/services/project-history/Dockerfile @@ -15,6 +15,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/project-history/package.json /overleaf/services/project-history/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile index f597b5fe5a..84d352c652 100644 --- a/services/real-time/Dockerfile +++ b/services/real-time/Dockerfile @@ -15,6 +15,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/real-time/package.json /overleaf/services/real-time/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/spelling/Dockerfile b/services/spelling/Dockerfile index e942dfa27b..6dc47cf597 100644 --- a/services/spelling/Dockerfile +++ b/services/spelling/Dockerfile @@ -17,6 +17,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/spelling/package.json /overleaf/services/spelling/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet diff --git a/services/track-changes/Dockerfile b/services/track-changes/Dockerfile index 06b522f338..f0e3d3b7df 100644 --- a/services/track-changes/Dockerfile +++ b/services/track-changes/Dockerfile @@ -15,6 +15,7 @@ FROM base as app COPY package.json package-lock.json /overleaf/ COPY services/track-changes/package.json /overleaf/services/track-changes/ COPY libraries/ /overleaf/libraries/ +COPY patches/ /overleaf/patches/ RUN cd /overleaf && npm ci --quiet