Feedbacked

.circleci/config.yml

@@ -47,5 +47,5 @@ workflows:
           imageName: rust
 
       - build-and-deploy-image:
-          name: therapist-build-and-deploy
-          imageName: therapist
+          name: python-node-build-and-deploy
+          imageName: python-node

bors.toml

@@ -2,7 +2,7 @@ status = [
   "ci/circleci: firefox-build-and-deploy",
   "ci/circleci: docker-build-and-deploy",
   "ci/circleci: rust-build-and-deploy",
-  "ci/circleci: therapist-build-and-deploy",
+  "ci/circleci: python-node-build-and-deploy",
 ]
 cut_body_after = "\n\n---\n\n" # Avoid including verbose details from Renovate in commit messages
 block_labels = ["bors-dont-merge"]

python-node/Dockerfile

@@ -3,18 +3,19 @@ FROM python:3-stretch@sha256:fa60a2d97d70f92713e7b8af684756516d6b3e37bf12be49641
 
 LABEL maintainer="Rehan Dalal <rdalal@mozilla.com>"
 
+RUN apt-get update
+RUN apt-get install -y apt-transport-https git
+
 # Install node prereqs, nodejs and yarn
 # Ref: https://deb.nodesource.com/setup_10.x
 # Ref: https://yarnpkg.com/en/docs/install
-RUN apt-get update && \
-    apt-get install -yqq apt-transport-https
 RUN echo "deb https://deb.nodesource.com/node_10.x stretch main" > /etc/apt/sources.list.d/nodesource.list && \
     wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list && \
     wget -qO- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     apt-get update && \
     apt-get install -yqq nodejs yarn && \
-    npm i -g npm@^6 && \
+    npm i -g npm@>=6 && \
     rm -rf /var/lib/apt/lists/*
 
 # Upgrade pip and install therapist