From 518651cbe9917d516307cc7fb1b782128713c176 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 11 Jan 2021 05:11:10 +0000 Subject: [PATCH 01/15] Update dependency dayjs to ^1.10.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee80acc..41b9334 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@types/node-cron": "^2.0.3", "bootstrap": "^4.5.3", "cron": "^1.8.2", - "dayjs": "^1.10.2", + "dayjs": "^1.10.3", "express": "^4.17.1", "flag-icon-css": "^3.5.0", "jsonpath-plus": "^4.0.0", -- 2.45.2 From a2e49517704641d9d73ec0fce59e99e9921f98aa Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 12 Jan 2021 05:11:07 +0000 Subject: [PATCH 02/15] Update dependency @types/express to ^4.17.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 41b9334..bc5dce7 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@angular/compiler-cli": "~11.0.7", "@angular/language-service": "~11.0.7", "@nguniversal/builders": "^11.0.1", - "@types/express": "^4.17.9", + "@types/express": "^4.17.10", "@types/node": "^14.0.23", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", -- 2.45.2 From 3f948d7d76706f13d88a7c72c5dc6da7ca3442f9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 13 Jan 2021 05:11:16 +0000 Subject: [PATCH 03/15] Update dependency @types/express to ^4.17.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bc5dce7..64676e4 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@angular/compiler-cli": "~11.0.7", "@angular/language-service": "~11.0.7", "@nguniversal/builders": "^11.0.1", - "@types/express": "^4.17.10", + "@types/express": "^4.17.11", "@types/node": "^14.0.23", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", -- 2.45.2 From 82f37c2742b5863d41572b21db0d9aca86624718 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 14 Jan 2021 05:13:18 +0000 Subject: [PATCH 04/15] Update dependency @fortawesome/fontawesome-free to ^5.15.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 64676e4..e71cb2f 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,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", + "@fortawesome/fontawesome-free": "^5.15.2", "@nguniversal/express-engine": "^11.0.1", "@ngx-translate/core": "^13.0.0", "@ngx-translate/http-loader": "^6.0.0", -- 2.45.2 From 34382aa106feeb2b7225a0d2e744ad46de59bd5b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 16 Jan 2021 05:11:24 +0000 Subject: [PATCH 05/15] Update dependency jsonpath-plus to v5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e71cb2f..da5efc7 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "dayjs": "^1.10.3", "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", -- 2.45.2 From 047c46f2dbb59892df84951cf03d6ffe6c98920c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 19 Jan 2021 16:49:58 +0000 Subject: [PATCH 06/15] Update dependency bootstrap to ^4.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da5efc7..2c93324 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@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.3", "express": "^4.17.1", -- 2.45.2 From 44adf25dbab649ab34021f765456fd1abb6d3f9f Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 25 Jan 2021 21:33:23 +0100 Subject: [PATCH 07/15] updated @angular/cdk --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee80acc..c8b7962 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "private": true, "dependencies": { "@angular/animations": "~11.0.7", - "@angular/cdk": "^11.0.3", + "@angular/cdk": "^11.1.0", "@angular/common": "~11.0.7", "@angular/compiler": "~11.0.7", "@angular/core": "~11.0.7", -- 2.45.2 From 15f2102d670cc79f9523b7b9aeca66170e23be8c Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 25 Jan 2021 21:34:28 +0100 Subject: [PATCH 08/15] updated @angular/cli --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c8b7962..0483f4e 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,8 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1100.6", - "@angular/cli": "~11.0.6", + "@angular-devkit/build-angular": "~0.1101.1", + "@angular/cli": "~11.1.1", "@angular/compiler-cli": "~11.0.7", "@angular/language-service": "~11.0.7", "@nguniversal/builders": "^11.0.1", @@ -57,7 +57,7 @@ "codelyzer": "^6.0.0", "jasmine-core": "~3.6.0", "jasmine-spec-reporter": "~5.0.0", - "karma": "~5.1.0", + "karma": "~5.2.3", "karma-chrome-launcher": "~3.1.0", "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "~4.0.0", -- 2.45.2 From cd91ad431dba5286809bc63b9989043d10381d51 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 25 Jan 2021 21:39:38 +0100 Subject: [PATCH 09/15] updated @angular/core --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 0483f4e..9d262fd 100644 --- a/package.json +++ b/package.json @@ -15,17 +15,17 @@ }, "private": true, "dependencies": { - "@angular/animations": "~11.0.7", + "@angular/animations": "~11.1.0", "@angular/cdk": "^11.1.0", - "@angular/common": "~11.0.7", - "@angular/compiler": "~11.0.7", - "@angular/core": "~11.0.7", - "@angular/forms": "~11.0.7", + "@angular/common": "~11.1.0", + "@angular/compiler": "~11.1.0", + "@angular/core": "~11.1.0", + "@angular/forms": "~11.1.0", "@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", + "@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.1", "@nguniversal/express-engine": "^11.0.1", "@ngx-translate/core": "^13.0.0", @@ -47,8 +47,8 @@ "devDependencies": { "@angular-devkit/build-angular": "~0.1101.1", "@angular/cli": "~11.1.1", - "@angular/compiler-cli": "~11.0.7", - "@angular/language-service": "~11.0.7", + "@angular/compiler-cli": "~11.1.0", + "@angular/language-service": "~11.1.0", "@nguniversal/builders": "^11.0.1", "@types/express": "^4.17.9", "@types/node": "^14.0.23", -- 2.45.2 From 4b7c7194b8152c6af4173309dae40340080df126 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 25 Jan 2021 21:41:47 +0100 Subject: [PATCH 10/15] updated @angular/material --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d262fd..0a96af0 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@angular/compiler": "~11.1.0", "@angular/core": "~11.1.0", "@angular/forms": "~11.1.0", - "@angular/material": "^11.0.3", + "@angular/material": "^11.1.0", "@angular/platform-browser": "~11.1.0", "@angular/platform-browser-dynamic": "~11.1.0", "@angular/platform-server": "~11.1.0", -- 2.45.2 From 42cfcdda573db09639b0ece9f4d3578f179dba95 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 25 Jan 2021 21:42:59 +0100 Subject: [PATCH 11/15] updated @nguniversal/express-engine --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0a96af0..e789862 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@angular/platform-server": "~11.1.0", "@angular/router": "~11.1.0", "@fortawesome/fontawesome-free": "^5.15.1", - "@nguniversal/express-engine": "^11.0.1", + "@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", @@ -49,7 +49,7 @@ "@angular/cli": "~11.1.1", "@angular/compiler-cli": "~11.1.0", "@angular/language-service": "~11.1.0", - "@nguniversal/builders": "^11.0.1", + "@nguniversal/builders": "^11.1.0", "@types/express": "^4.17.9", "@types/node": "^14.0.23", "@types/jasmine": "~3.6.0", -- 2.45.2 From 53b9a0df73ae74cf1756f4ec69112ee8d7efde83 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 25 Jan 2021 21:59:21 +0100 Subject: [PATCH 12/15] updated dependencies --- package.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index e789862..da2449e 100644 --- a/package.json +++ b/package.json @@ -26,23 +26,23 @@ "@angular/platform-browser-dynamic": "~11.1.0", "@angular/platform-server": "~11.1.0", "@angular/router": "~11.1.0", - "@fortawesome/fontawesome-free": "^5.15.1", + "@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.1101.1", @@ -50,21 +50,21 @@ "@angular/compiler-cli": "~11.1.0", "@angular/language-service": "~11.1.0", "@nguniversal/builders": "^11.1.0", - "@types/express": "^4.17.9", - "@types/node": "^14.0.23", - "@types/jasmine": "~3.6.0", - "@types/jasminewd2": "~2.0.3", - "codelyzer": "^6.0.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.2.3", + "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" } } -- 2.45.2 From 821a43177d8366744589aba81cd9237fffdbb2b9 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 25 Jan 2021 23:04:41 +0100 Subject: [PATCH 13/15] updated Dockerfile and renovate.json --- Dockerfile | 8 +++++++- renovate.json | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8a18d76..c005546 100644 --- a/Dockerfile +++ b/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 diff --git a/renovate.json b/renovate.json index 750c5c1..eeb3e06 100644 --- a/renovate.json +++ b/renovate.json @@ -6,6 +6,20 @@ "develop" ], "rangeStrategy": "bump", + "rebaseWhen": "behind-base-branch", + "regexManagers": [ + { + "fileMatch": [ + "^Dockerfile$" + ], + "matchStrings": [ + "\\s+(?[a-z0-9\\-]+?)=\"(?.*?)\"" + ], + "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" + ] } ] } -- 2.45.2 From 4ff005de5bbea9379a32297126da2b0c4c7ead8e Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 25 Jan 2021 23:08:46 +0100 Subject: [PATCH 14/15] updated .drone.yml --- .drone.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index f1073e1..7e2e8d5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: build - image: node:alpine + image: node:slim commands: - npm install - npm run build:ssr @@ -22,12 +22,11 @@ steps: from_secret: USERNAME password: from_secret: PASSWORD - -trigger: - branch: - - master - event: - - push + when: + branch: + - master + event: + - push --- kind: pipeline @@ -54,11 +53,12 @@ steps: from_secret: USERNAME password: from_secret: PASSWORD - when: - branch: - - master - event: - - push + +trigger: + branch: + - master + event: + - push --- kind: pipeline -- 2.45.2 From 60ec867809b0798416fc0550cd931faf5da72f1e Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 25 Jan 2021 23:19:56 +0100 Subject: [PATCH 15/15] updated .drone.yml --- .drone.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7e2e8d5..d52d478 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: build - image: node:slim + image: node:12.20.1-buster@sha256:ce4f3c9c90400203824d1029f068fd826e2ec64226f2109eb0745681550e5972 commands: - npm install - npm run build:ssr @@ -22,11 +22,11 @@ steps: from_secret: USERNAME password: from_secret: PASSWORD - when: - branch: - - master - event: - - push + when: + branch: + - main + event: + - push --- kind: pipeline @@ -39,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 @@ -56,7 +56,7 @@ steps: 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 -- 2.45.2