From 2f5bcebcdd27547529e9fd8d530b0ee01f599b02 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 30 May 2024 10:43:40 +0200 Subject: [PATCH] Merge pull request #18570 from overleaf/jpa-lean-npm-install [server-ce] omit devDependencies from final image GitOrigin-RevId: e35d7010ee33345121fb175e0400be122cb468c1 --- server-ce/Dockerfile | 1 - server-ce/genScript.js | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile index 36e00ae79d..13e87ccb9e 100644 --- a/server-ce/Dockerfile +++ b/server-ce/Dockerfile @@ -21,7 +21,6 @@ ADD patches/ /overleaf/patches # Install npm dependencies # ------------------------ -ENV CYPRESS_INSTALL_BINARY=0 RUN node genScript install | bash # Compile diff --git a/server-ce/genScript.js b/server-ce/genScript.js index fb9e9b7eaf..230fa20bc1 100644 --- a/server-ce/genScript.js +++ b/server-ce/genScript.js @@ -5,16 +5,24 @@ console.log('set -ex') switch (process.argv.pop()) { case 'install': - console.log('npm ci') + console.log('npm install --omit=dev') break case 'compile': for (const service of services) { console.log('pushd', `services/${service.name}`) switch (service.name) { case 'web': + // Avoid downloading of cypress + console.log('export CYPRESS_INSTALL_BINARY=0') + + // install webpack and frontend dependencies + console.log('npm install --include=dev') + // run webpack console.log('npm run webpack:production') // drop webpack/babel cache console.log('rm -rf node_modules/.cache') + // uninstall webpack and frontend dependencies + console.log('npm install --omit=dev') break default: console.log(`echo ${service.name} does not require a compilation`)