Merge pull request 'develop' (#76) from develop into main

Reviewed-on: #76

.drone.yml

@@ -8,7 +8,7 @@ platform:
 
 steps:
   - name: build
-    image: node:alpine
+    image: node:12.20.1-buster@sha256:ce4f3c9c90400203824d1029f068fd826e2ec64226f2109eb0745681550e5972
     commands:
       - npm install
       - npm run build:ssr
@@ -22,10 +22,9 @@ steps:
         from_secret: USERNAME
       password:
         from_secret: PASSWORD
-
-trigger:
+    when:
       branch:
-    - master
+        - main
       event:
         - push
 
@@ -40,7 +39,7 @@ platform:
 
 steps:
   - name: build
-    image: node:alpine
+    image: node:12.20.1-buster@sha256:4f006d33bdf44b35d18a867043738510f60526697c7d4118ea38b334f86ae0eb
     commands:
       - npm install
       - npm run build:ssr
@@ -54,9 +53,10 @@ steps:
         from_secret: USERNAME
       password:
         from_secret: PASSWORD
-    when:
+
+trigger:
   branch:
-        - master
+    - main
   event:
     - push
 
@@ -71,7 +71,7 @@ platform:
 
 steps:
   - name: build
-    image: node:alpine
+    image: node:12.20.1-buster@sha256:37d6f1cfdef57f170dce16d72ed21c5d463bed4a6ed340c056ef91cb94e39199
     commands:
       - npm install
       - npm run build:ssr
@@ -88,7 +88,7 @@ steps:
 
 trigger:
   branch:
-    - master
+    - main
   event:
     - push
 
@@ -125,6 +125,6 @@ depends_on:
 
 trigger:
   branch:
-    - master
+    - main
   event:
     - push

Dockerfile

@@ -1,4 +1,10 @@
-FROM node:14.15.4-alpine
+ARG ARCH
+FROM amd64/alpine:3.12.3@sha256:074d3636ebda6dd446d0d00304c4454f468237fdacf08fb0eeac90bdbfa1bac7 AS base-amd64
+FROM arm32v7/alpine:3.12.3@sha256:299294be8699c1b323c137f972fd0aa5eaa4b95489c213091dcf46ef39b6c810 AS base-arm
+FROM arm64v8/alpine:3.12.3@sha256:549694ea68340c26d1d85c00039aa11ad835be279bfd475ff4284b705f92c24e AS base-arm64
+FROM base-${ARCH}
+
+RUN apk --no-cache add nodejs="12.20.1-r0"
 
 COPY dist/universal-statuspage /universal-statuspage
 

package.json

@@ -15,56 +15,56 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~11.0.7",
-    "@angular/cdk": "^11.0.3",
-    "@angular/common": "~11.0.7",
-    "@angular/compiler": "~11.0.7",
-    "@angular/core": "~11.0.7",
-    "@angular/forms": "~11.0.7",
-    "@angular/material": "^11.0.3",
-    "@angular/platform-browser": "~11.0.7",
-    "@angular/platform-browser-dynamic": "~11.0.7",
-    "@angular/platform-server": "~11.0.7",
-    "@angular/router": "~11.0.7",
-    "@fortawesome/fontawesome-free": "^5.15.1",
-    "@nguniversal/express-engine": "^11.0.1",
+    "@angular/animations": "~11.1.0",
+    "@angular/cdk": "^11.1.0",
+    "@angular/common": "~11.1.0",
+    "@angular/compiler": "~11.1.0",
+    "@angular/core": "~11.1.0",
+    "@angular/forms": "~11.1.0",
+    "@angular/material": "^11.1.0",
+    "@angular/platform-browser": "~11.1.0",
+    "@angular/platform-browser-dynamic": "~11.1.0",
+    "@angular/platform-server": "~11.1.0",
+    "@angular/router": "~11.1.0",
+    "@fortawesome/fontawesome-free": "^5.15.2",
+    "@nguniversal/express-engine": "^11.1.0",
     "@ngx-translate/core": "^13.0.0",
     "@ngx-translate/http-loader": "^6.0.0",
     "@types/node-cron": "^2.0.3",
-    "bootstrap": "^4.5.3",
+    "bootstrap": "^4.6.0",
     "cron": "^1.8.2",
-    "dayjs": "^1.10.2",
+    "dayjs": "^1.10.4",
     "express": "^4.17.1",
     "flag-icon-css": "^3.5.0",
-    "jsonpath-plus": "^4.0.0",
+    "jsonpath-plus": "^5.0.2",
     "node-cron": "^2.0.3",
     "roboto-fontface": "^0.10.0",
     "rxjs": "~6.6.3",
-    "tslib": "^2.0.0",
+    "tslib": "^2.1.0",
     "tz-offset": "0.0.2",
-    "zone.js": "~0.10.2"
+    "zone.js": "~0.11.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1100.6",
-    "@angular/cli": "~11.0.6",
-    "@angular/compiler-cli": "~11.0.7",
-    "@angular/language-service": "~11.0.7",
-    "@nguniversal/builders": "^11.0.1",
-    "@types/express": "^4.17.9",
-    "@types/node": "^14.0.23",
-    "@types/jasmine": "~3.6.0",
-    "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "^6.0.0",
+    "@angular-devkit/build-angular": "~0.1101.1",
+    "@angular/cli": "~11.1.1",
+    "@angular/compiler-cli": "~11.1.0",
+    "@angular/language-service": "~11.1.0",
+    "@nguniversal/builders": "^11.1.0",
+    "@types/express": "^4.17.11",
+    "@types/node": "^14.14.22",
+    "@types/jasmine": "~3.6.3",
+    "@types/jasminewd2": "~2.0.8",
+    "codelyzer": "^6.0.1",
     "jasmine-core": "~3.6.0",
-    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.1.0",
+    "jasmine-spec-reporter": "~6.0.0",
+    "karma": "~6.0.1",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "^1.5.0",
+    "karma-coverage-istanbul-reporter": "~3.0.3",
+    "karma-jasmine": "~4.0.1",
+    "karma-jasmine-html-reporter": "^1.5.4",
     "protractor": "~7.0.0",
-    "ts-node": "~8.10.2",
+    "ts-node": "~9.1.1",
     "tslint": "~6.1.0",
-    "typescript": "~4.0.5"
+    "typescript": "~4.1.3"
   }
 }

renovate.json

@@ -6,6 +6,20 @@
     "develop"
   ],
   "rangeStrategy": "bump",
+  "rebaseWhen": "behind-base-branch",
+  "regexManagers": [
+    {
+      "fileMatch": [
+        "^Dockerfile$"
+      ],
+      "matchStrings": [
+        "\\s+(?<depName>[a-z0-9\\-]+?)=\"(?<currentValue>.*?)\""
+      ],
+      "lookupNameTemplate": "alpine_3_12/{{{depName}}}",
+      "versioningTemplate": "loose",
+      "datasourceTemplate": "repology"
+    }
+  ],
   "packageRules": [
     {
       "managers": [
@@ -30,6 +44,22 @@
         "^jasmine"
       ],
       "enabled": false
+    },
+    {
+      "datasources": [
+        "repology"
+      ],
+      "groupName": [
+        "base dependencies"
+      ]
+    },
+    {
+      "datasources": [
+        "docker"
+      ],
+      "groupName": [
+        "docker images"
+      ]
     }
   ]
 }