Merge pull request #6211 from overleaf/em-code-sharing

Change directory layout in service containers

GitOrigin-RevId: 09ff19db2a123cbf7691d51e9ce9be6eee264287
This commit is contained in:
Eric Mc Sween
2022-01-07 09:03:22 +00:00
committed by Copybot
parent b4fefe88b6
commit 5419a54afc
57 changed files with 225 additions and 210 deletions
+17 -15
View File
@@ -1,7 +1,8 @@
# the base image is suitable for running web with /app bind mounted
# the base image is suitable for running web with /overleaf/services/web bind
# mounted
FROM node:14.18.1 as base
WORKDIR /app
WORKDIR /overleaf/services/web
# install_deps changes app files and installs npm packages
# as such it has to run at a later stage
@@ -10,12 +11,13 @@ RUN apt-get update \
&& apt-get install -y parallel \
&& rm -rf /var/lib/apt/lists/*
RUN mkdir /app/node_modules && chown node:node /app/node_modules
RUN mkdir /overleaf/services/web/node_modules \
&& chown node:node /overleaf/services/web/node_modules
# the deps image is used for caching npm ci
FROM base as deps
COPY package.json package-lock.json /app/
COPY services/web/package.json services/web/package-lock.json /overleaf/services/web/
RUN npm ci --quiet
@@ -23,16 +25,16 @@ RUN npm ci --quiet
# the dev is suitable for running tests
FROM deps as dev
COPY . /app
COPY services/web /overleaf/services/web
RUN mkdir -p /app/data/dumpFolder && \
mkdir -p /app/data/logs && \
mkdir -p /app/data/pdf && \
mkdir -p /app/data/uploads && \
mkdir -p /app/data/zippedProjects && \
mkdir -p /app/data/projectHistories && \
chmod -R 0755 /app/data/ && \
chown -R node:node /app/data/
RUN mkdir -p /overleaf/services/web/data/dumpFolder \
&& mkdir -p /overleaf/services/web/data/logs \
&& mkdir -p /overleaf/services/web/data/pdf \
&& mkdir -p /overleaf/services/web/data/uploads \
&& mkdir -p /overleaf/services/web/data/zippedProjects \
&& mkdir -p /overleaf/services/web/data/projectHistories \
&& chmod -R 0755 /overleaf/services/web/data \
&& chown -R node:node /overleaf/services/web/data
ARG SENTRY_RELEASE
ENV SENTRY_RELEASE=$SENTRY_RELEASE
@@ -50,8 +52,8 @@ RUN chmod 0755 ./install_deps.sh && ./install_deps.sh
# the final production image without webpack source maps
FROM webpack as app
RUN find /app/public -name '*.js.map' -delete
RUN rm /app/modules/server-ce-scripts -rf
RUN find /overleaf/services/web/public -name '*.js.map' -delete
RUN rm /overleaf/services/web/modules/server-ce-scripts -rf
USER node
CMD ["node", "--expose-gc", "app.js"]