diff --git a/CHANGELOG.md b/CHANGELOG.md index 97efb69c7..26b49f2dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # CHANGELOG - sitespeed.io (we use [semantic versioning](https://semver.org)) - +## 20.4.1 - 2021-10-29 +### Fixed +* Reverted the change with npm in the Docketr container since it broke both webpagetest and the +1 container installation ## 20.4.0 - 2021-10-29 ### Added diff --git a/Dockerfile b/Dockerfile index 3fe5fbd82..eb0a16f06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ RUN mkdir -p /usr/src/app WORKDIR /usr/src/app COPY package.* /usr/src/app/ -RUN npm install --production && npm cache clean --force && npm uninstall npm -g +RUN npm install --production && npm cache clean --force COPY . /usr/src/app COPY docker/scripts/start.sh /start.sh diff --git a/docker/Dockerfile-plus1 b/docker/Dockerfile-plus1 index 3edbb17db..d2dd5c23e 100644 --- a/docker/Dockerfile-plus1 +++ b/docker/Dockerfile-plus1 @@ -6,7 +6,8 @@ ENV SITESPEED_IO_BROWSERTIME__DOCKER true ENV SITESPEED_IO_PLUGINS__ADD /lighthouse,/gpsi RUN sudo apt-get update && sudo apt-get install git -y - +RUN node --version +RUN npm --version WORKDIR /gpsi RUN git clone https://github.com/sitespeedio/plugin-gpsi.git . RUN npm install --production