From f052625396de35531e7015757eb664ca41a55e6e Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 17 Sep 2020 15:43:32 +0100 Subject: [PATCH] [misc] bump the dev-env to 3.3.4 and bump the node version to 10.22.1 --- services/track-changes/.github/dependabot.yml | 6 ++++++ services/track-changes/.nvmrc | 2 +- services/track-changes/Dockerfile | 2 +- services/track-changes/buildscript.txt | 4 ++-- services/track-changes/docker-compose.yml | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/services/track-changes/.github/dependabot.yml b/services/track-changes/.github/dependabot.yml index c6f98d843d..e2c64a3351 100644 --- a/services/track-changes/.github/dependabot.yml +++ b/services/track-changes/.github/dependabot.yml @@ -15,3 +15,9 @@ updates: # Block informal upgrades -- security upgrades use a separate queue. # https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates#open-pull-requests-limit open-pull-requests-limit: 0 + + # currently assign team-magma to all dependabot PRs - this may change in + # future if we reorganise teams + labels: + - "dependencies" + - "Team-Magma" diff --git a/services/track-changes/.nvmrc b/services/track-changes/.nvmrc index b61c07ffdd..c2f6421352 100644 --- a/services/track-changes/.nvmrc +++ b/services/track-changes/.nvmrc @@ -1 +1 @@ -10.21.0 +10.22.1 diff --git a/services/track-changes/Dockerfile b/services/track-changes/Dockerfile index 78a715757d..f0e362fca0 100644 --- a/services/track-changes/Dockerfile +++ b/services/track-changes/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -FROM node:10.21.0 as base +FROM node:10.22.1 as base WORKDIR /app diff --git a/services/track-changes/buildscript.txt b/services/track-changes/buildscript.txt index 1750deaa0e..24350af64f 100644 --- a/services/track-changes/buildscript.txt +++ b/services/track-changes/buildscript.txt @@ -3,6 +3,6 @@ track-changes --docker-repos=gcr.io/overleaf-ops --env-add=AWS_BUCKET=bucket --env-pass-through= ---node-version=10.21.0 +--node-version=10.22.1 --public-repo=True ---script-version=3.3.2 +--script-version=3.3.4 diff --git a/services/track-changes/docker-compose.yml b/services/track-changes/docker-compose.yml index ba2b13aad6..d2d867a391 100644 --- a/services/track-changes/docker-compose.yml +++ b/services/track-changes/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:10.21.0 + image: node:10.22.1 volumes: - .:/app working_dir: /app @@ -18,7 +18,7 @@ services: user: node test_acceptance: - image: node:10.21.0 + image: node:10.22.1 volumes: - .:/app working_dir: /app