From a84d0dbd34b39bc47b551d106e6b55119c63a4a1 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Tue, 22 Mar 2022 18:09:49 +0100 Subject: [PATCH] Include shrinkwrap when building (#3604) * Include shrinkwrap when building * include docker again --- .dockerignore | 2 ++ Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 552fe5a10..8ce97589b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,4 +2,6 @@ !bin !lib !package.json +!LICENSE +!npm-shrinkwrap.json !docker diff --git a/Dockerfile b/Dockerfile index 859c84c2e..29a40774c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,8 @@ RUN wpr installroot --https_cert_file /webpagereplay/certs/wpr_cert.pem --https_ RUN mkdir -p /usr/src/app WORKDIR /usr/src/app -COPY package.* /usr/src/app/ +COPY package.json /usr/src/app/ +COPY npm-shrinkwrap.json /usr/src/app/ RUN npm install --production && npm cache clean --force COPY . /usr/src/app @@ -37,7 +38,6 @@ RUN mkdir -m 0750 /root/.android ADD docker/adb/insecure_shared_adbkey /root/.android/adbkey ADD docker/adb/insecure_shared_adbkey.pub /root/.android/adbkey.pub - # Allow all users to run commands needed by sitespeedio/throttle via sudo # See https://github.com/sitespeedio/throttle/blob/main/lib/tc.js RUN echo 'ALL ALL=NOPASSWD: /usr/sbin/tc, /usr/sbin/route, /usr/sbin/ip' > /etc/sudoers.d/tc