Bug 1788284: Add node 16 to the updatebot docker image and fix pdfjs' npm invocations r=calixte

Differential Revision: https://phabricator.services.mozilla.com/D156113
This commit is contained in:
Tom Ritter 2022-09-01 13:49:15 +00:00
Родитель e57987e3d0
Коммит ace18b0984
3 изменённых файлов: 9 добавлений и 4 удалений

Просмотреть файл

@ -3,6 +3,9 @@ MAINTAINER Tom Ritter <tom@mozilla.com>
VOLUME /builds/worker/checkouts
# %include taskcluster/docker/recipes/install-node.sh
ADD topsrcdir/taskcluster/docker/recipes/install-node.sh /setup/install-node.sh
COPY privileged-setup.sh /setup/privileged-setup.sh
COPY updatebot-version.sh /setup/updatebot-version.sh
COPY setup.sh /builds/worker/setup.sh

Просмотреть файл

@ -35,8 +35,6 @@ apt-get install -y --no-install-recommends \
python3-requests \
python3-requests-unixsocket \
python3-setuptools \
nodejs \
npm \
openssh-client \
rsync \
wget
@ -45,6 +43,9 @@ mkdir -p /builds/worker/.mozbuild
chown -R worker:worker /builds/worker/
export GOPATH=/builds/worker/go
# nodejs 16 for pdfjs
. install-node.sh
# pdf.js setup
# We want to aviod downloading a ton of packages all the time, so
# we will preload the pdf.js repo (and packages) in the Docker image
@ -54,7 +55,8 @@ npm install -g gulp-cli
cd /builds/worker/
git clone https://github.com/mozilla/pdf.js.git
cd /builds/worker/pdf.js
npm ci
npm ci --legacy-peer-deps
# Build Google's Cloud SQL Proxy from source
cd /builds/worker/

Просмотреть файл

@ -27,7 +27,7 @@ pushd "$ROOT" || exit
git fetch origin
git checkout "$1"
npm install --ignore-scripts
npm install --legacy-peer-deps --ignore-scripts
gulp mozcentral