agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-12 13:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13566 from overleaf/ae-node-docker

Browse Source 
Use `node:16.20.1` base image

GitOrigin-RevId: cc00545a18a3e8d902e49c53e87ea21234403603
This commit is contained in:
Eric Mc Sween
2023-07-17 10:45:23 +00:00
committed by Copybot
parent ad006205ec
commit 13ea6b1860
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/history-v1/Dockerfile
+1 -1
View File
@@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 as base FROM node:16.20.1 as base
WORKDIR /overleaf/services/history-v1 WORKDIR /overleaf/services/history-v1
services/history-v1/Makefile
+1 -1
View File
@@ -30,7 +30,7 @@ HERE=$(shell pwd)
MONOREPO=$(shell cd ../../ && pwd) MONOREPO=$(shell cd ../../ && pwd)
# Run the linting commands in the scope of the monorepo. # Run the linting commands in the scope of the monorepo.
# Eslint and prettier (plus some configs) are on the root. # Eslint and prettier (plus some configs) are on the root.
RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 npm run --silent RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.20.1 npm run --silent
format: format:
$(RUN_LINTING) format $(RUN_LINTING) format
services/history-v1/buildscript.txt
+1 -1
View File
@@ -5,6 +5,6 @@ history-v1
--env-pass-through= --env-pass-through=
--esmock-loader=False --esmock-loader=False
--has-custom-nodemon=True --has-custom-nodemon=True
--node-version=gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 --node-version=node:16.20.1
--public-repo=False --public-repo=False
--script-version=4.2.0 --script-version=4.2.0
services/history-v1/docker-compose.yml
+2 -2
View File
@@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 image: node:16.20.1
volumes: volumes:
- .:/overleaf/services/history-v1 - .:/overleaf/services/history-v1
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 image: node:16.20.1
volumes: volumes:
- .:/overleaf/services/history-v1 - .:/overleaf/services/history-v1
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
services/real-time/Dockerfile
+1 -1
View File
@@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/overleaf/internal/ # https://github.com/overleaf/internal/
FROM gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 as base FROM node:16.20.1 as base
WORKDIR /overleaf/services/real-time WORKDIR /overleaf/services/real-time
services/real-time/Makefile
+1 -1
View File
@@ -30,7 +30,7 @@ HERE=$(shell pwd)
MONOREPO=$(shell cd ../../ && pwd) MONOREPO=$(shell cd ../../ && pwd)
# Run the linting commands in the scope of the monorepo. # Run the linting commands in the scope of the monorepo.
# Eslint and prettier (plus some configs) are on the root. # Eslint and prettier (plus some configs) are on the root.
RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 npm run --silent RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.20.1 npm run --silent
format: format:
$(RUN_LINTING) format $(RUN_LINTING) format
services/real-time/buildscript.txt
+1 -1
View File
@@ -3,6 +3,6 @@ real-time
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-version=gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 --node-version=node:16.20.1
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0
services/real-time/docker-compose.yml
+2 -2
View File
@@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 image: node:16.20.1
volumes: volumes:
- .:/overleaf/services/real-time - .:/overleaf/services/real-time
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 image: node:16.20.1
volumes: volumes:
- .:/overleaf/services/real-time - .:/overleaf/services/real-time
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
services/web/Dockerfile
+1 -1
View File
@@ -1,6 +1,6 @@
# the base image is suitable for running web with /overleaf/services/web bind # the base image is suitable for running web with /overleaf/services/web bind
# mounted # mounted
FROM gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 as base FROM node:16.20.1 as base
WORKDIR /overleaf/services/web WORKDIR /overleaf/services/web
services/web/Dockerfile.frontend
+1 -1
View File
@@ -1,4 +1,4 @@
FROM gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 FROM node:16.20.1
# Install Google Chrome # Install Google Chrome
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
services/web/docker-compose.yml
+2 -2
View File
@@ -6,7 +6,7 @@ volumes:
services: services:
test_unit: test_unit:
image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 image: node:16.20.1
volumes: volumes:
- .:/overleaf/services/web - .:/overleaf/services/web
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@@ -21,7 +21,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 image: node:16.20.1
volumes: volumes:
- .:/overleaf/services/web - .:/overleaf/services/web
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules