resolve merge conflicts

services/document-updater/Dockerfile

@@ -1,7 +1,14 @@
-FROM node:6.9.5 as app
+# This file was auto-generated, do not edit it directly.
+# Instead run bin/update_build_scripts from
+# https://github.com/sharelatex/sharelatex-dev-environment
+# Version: 1.3.5
+
+FROM node:10.19.0 as base
 
 WORKDIR /app
 
+FROM base as app
+
 #wildcard as some files may not be in all repos
 COPY package*.json npm-shrink*.json /app/
 
@@ -12,11 +19,9 @@ COPY . /app
 
 RUN npm run compile:all
 
-FROM node:6.9.5
+FROM base
 
 COPY --from=app /app /app
-
-WORKDIR /app
 USER node
 
 CMD ["node", "--expose-gc", "app.js"]

services/document-updater/docker-compose.ci.yml

@@ -1,9 +1,9 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.24
+# Version: 1.3.5
 
-version: "2"
+version: "2.3"
 
 services:
   test_unit:
@@ -13,7 +13,6 @@ services:
     environment:
       NODE_ENV: test
 
-
   test_acceptance:
     build: .
     image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
@@ -26,14 +25,15 @@ services:
       MOCHA_GREP: ${MOCHA_GREP}
       NODE_ENV: test
     depends_on:
-      - mongo
-      - redis
-      - new_redis
+      mongo:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+      new_redis:
+        condition: service_healthy
     user: node
     command: npm run test:acceptance:_run
 
-
-
   tar:
     build: .
     image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
@@ -41,7 +41,6 @@ services:
       - ./:/tmp/build/
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
-
   redis:
     image: redis
 
@@ -49,4 +48,4 @@ services:
     image: redis
 
   mongo:
-    image: mongo:3.4
+    image: mongo:3.6

services/document-updater/docker-compose.yml

@@ -1,13 +1,13 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.24
+# Version: 1.3.5
 
-version: "2"
+version: "2.3"
 
 services:
   test_unit:
-    image: node:6.9.5
+    image: node:10.19.0
     volumes:
       - .:/app
     working_dir: /app
@@ -18,7 +18,7 @@ services:
     user: node
 
   test_acceptance:
-    build: .
+    image: node:10.19.0
     volumes:
       - .:/app
     working_dir: /app
@@ -33,19 +33,14 @@ services:
       NODE_ENV: test
     user: node
     depends_on:
-      - mongo
-      - redis
-      - new_redis
+      mongo:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+      new_redis:
+        condition: service_healthy
     command: npm run test:acceptance
 
-  tar:
-    build: .
-    image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
-    volumes:
-      - ./:/tmp/build/
-    command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
-    user: root
-
   redis:
     image: redis
 
@@ -53,4 +48,4 @@ services:
     image: redis
 
   mongo:
-    image: mongo:3.4
+    image: mongo:3.6