Merge branch 'master' into letter-html-content

watchdogpolska · Dec 9, 2020 · b64f51d · b64f51d
2 parents c4cbf46 + cd8d897
commit b64f51d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/.contrib/docker/Dockerfile.gulp b/.contrib/docker/Dockerfile.gulp
@@ -1,4 +1,4 @@
-FROM node:15
+FROM node:14
 WORKDIR /app
 VOLUME /app
 CMD ["bash","-c", "npm install && npm rebuild node-sass && npx gulp build"]
diff --git a/.contrib/docker/Dockerfile.web b/.contrib/docker/Dockerfile.web
@@ -1,6 +1,7 @@
 # This is Dockerfile for development purposes only.
 ARG PYTHON_VERSION='3'
 FROM python:${PYTHON_VERSION}-slim
+RUN pip install 'pip<20'
 RUN mkdir /code /code/production
 WORKDIR /code
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -110,4 +110,3 @@ gulp.task('watch', function () {
 gulp.task('build', gulp.series('icons', 'js', 'scss'));
 
 gulp.task('default', gulp.series('build', 'watch'));
-
diff --git a/package-lock.json b/package-lock.json
diff --git a/renovate.json b/renovate.json
@@ -20,5 +20,13 @@
   },
   "dockerfile": {
     "fileMatch": ["^.contrib/docker/Dockerfile\\..*$"]
+  },
+  "constraints": {
+    "node": "< 15.0.0"
+  },
+  "force": {
+    "constraints": {
+      "node": "< 15.0.0"
+    }
   }
 }