Преглед изворни кода

Merge pull request #72 from overleaf/jpa-build-scripts-1-3-5

[misc] update the build scripts to 1.3.5
Jakob Ackermann пре 6 година
родитељ
комит
77555fcf13

+ 5 - 5
services/track-changes/Dockerfile

@@ -1,12 +1,14 @@
 # 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.4
+# Version: 1.3.5
 
-FROM node:10.19.0 as app
+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/
 
@@ -17,11 +19,9 @@ COPY . /app
 
 RUN npm run compile:all
 
-FROM node:10.19.0
+FROM base
 
 COPY --from=app /app /app
-
-WORKDIR /app
 USER node
 
 CMD ["node", "--expose-gc", "app.js"]

+ 1 - 1
services/track-changes/Makefile

@@ -1,7 +1,7 @@
 # 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.4
+# Version: 1.3.5
 
 BUILD_NUMBER ?= local
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)

+ 1 - 1
services/track-changes/buildscript.txt

@@ -7,4 +7,4 @@ track-changes
 --dependencies=mongo,redis,s3
 --docker-repos=gcr.io/overleaf-ops
 --env-pass-through=
---script-version=1.3.4
+--script-version=1.3.5

+ 2 - 2
services/track-changes/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.3.4
+# Version: 1.3.5
 
-version: "2.1"
+version: "2.3"
 
 services:
   test_unit:

+ 3 - 3
services/track-changes/docker-compose.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.3.4
+# Version: 1.3.5
 
-version: "2.1"
+version: "2.3"
 
 services:
   test_unit:
@@ -28,7 +28,7 @@ services:
       MONGO_HOST: mongo
       POSTGRES_HOST: postgres
       AWS_S3_ENDPOINT: http://s3:9090
-      AWS_S3_PATH_STYLE: "true"
+      AWS_S3_PATH_STYLE: 'true'
       AWS_ACCESS_KEY_ID: fake
       AWS_SECRET_ACCESS_KEY: fake
       MOCHA_GREP: ${MOCHA_GREP}