Merge branch 'master' into DooHTML-v0.70.2-keyed

Author: hman61

.gitignore

@@ -41,6 +41,7 @@ angular*/src/app.ngsummary.json
 tests/results/completed/
 target/
 webdriver-ts/results/
+webdriver-ts/traces/
 webdriver-ts/results*/
 webdriver-ts/old_results/
 webdriver-ts-results/table_*.html

Chrome_Results.ods

@@ -1,19 +1,20 @@
 
-FROM ubuntu:20.10
+FROM ubuntu:21.10
 COPY install_rust.sh /root/
 RUN echo "unsafe-perm = true" > /root/.npmrc
 RUN echo "NG_CLI_ANALYTICS=ci" >> /root/.npmrc
 RUN echo "{ \"allow_root\": true }" >  /root/.bowerrc
 
 # replace shell with bash so we can source files
 RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
 RUN apt-get update
-RUN apt-get install -y m4 libtinfo5 libghc-zlib-dev rsync ghc haskell-stack curl g++ make git openjdk-8-jdk dos2unix
+RUN apt-get install -y python3 m4 libtinfo5 libghc-zlib-dev rsync ghc haskell-stack curl g++ make git openjdk-8-jdk dos2unix python
 
 ENV NVM_DIR /usr/local/nvm
 RUN mkdir -p $NVM_DIR
-ENV NODE_VERSION 14.4.0
+ENV NODE_VERSION 16.13.2
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash
 
 # install node and npm
@@ -26,9 +27,6 @@ RUN source $NVM_DIR/nvm.sh \
 ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
 ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
 
-RUN curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb > /root/google-chrome-stable_current_amd64.deb
-RUN apt install -y /root/google-chrome-stable_current_amd64.deb
-
 RUN mkdir /server
 RUN mkdir /build
 RUN mkdir /src
@@ -40,6 +38,7 @@ RUN npm install
 # Volume before chown changes owwner
 VOLUME /src
 VOLUME /build
+COPY package.json /build
 WORKDIR /build
 
 # Install rust