From 04e0960f0558c1c1e0e6f971b193a39706719c29 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 10 Feb 2020 17:10:40 +0100 Subject: [PATCH] [misc] update the build scripts to 1.3.5 --- services/track-changes/Dockerfile | 10 +++++----- services/track-changes/Makefile | 2 +- services/track-changes/buildscript.txt | 2 +- services/track-changes/docker-compose.ci.yml | 4 ++-- services/track-changes/docker-compose.yml | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/services/track-changes/Dockerfile b/services/track-changes/Dockerfile index 31e35b1529..e538fb48d9 100644 --- a/services/track-changes/Dockerfile +++ b/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"] diff --git a/services/track-changes/Makefile b/services/track-changes/Makefile index 6be6b7acb2..b139b47573 100644 --- a/services/track-changes/Makefile +++ b/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) diff --git a/services/track-changes/buildscript.txt b/services/track-changes/buildscript.txt index 7da4826a03..039db45c26 100644 --- a/services/track-changes/buildscript.txt +++ b/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 diff --git a/services/track-changes/docker-compose.ci.yml b/services/track-changes/docker-compose.ci.yml index 58033f8156..e9c3f7ecbf 100644 --- a/services/track-changes/docker-compose.ci.yml +++ b/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: diff --git a/services/track-changes/docker-compose.yml b/services/track-changes/docker-compose.yml index 74d0acc683..300d7b45ec 100644 --- a/services/track-changes/docker-compose.yml +++ b/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}