Merge remote-tracking branch 'origin/develop' into develop
Some checks reported errors
continuous-integration/drone/push Build was killed

# Conflicts:
#	.drone.yml
This commit is contained in:
Samuel Philipp 2021-03-27 22:21:49 +01:00
commit e02ce834d8
Signed by: samuel-p
GPG key ID: 2AD495D17760CB4E
3 changed files with 9 additions and 9 deletions

View file

@ -8,7 +8,7 @@ platform:
steps:
- name: build
image: amd64/node:12.20.1-buster@sha256:ce4f3c9c90400203824d1029f068fd826e2ec64226f2109eb0745681550e5972
image: amd64/node:12.21.0-buster@sha256:e56a70a93f79dcf6b22104495ea4dc03ebb266123040455ccb4960910c668a1c
commands:
- npm install
- npm run build:ssr
@ -39,7 +39,7 @@ platform:
steps:
- name: build
image: arm64v8/node:12.20.1-buster@sha256:4f006d33bdf44b35d18a867043738510f60526697c7d4118ea38b334f86ae0eb
image: arm64v8/node:12.21.0-buster@sha256:d96d100df72d0f862f5338414489e5847cda289807fb069064a5c57ee5a941c5
commands:
- npm install
- npm run build:ssr
@ -72,7 +72,7 @@ trigger:
#
#steps:
# - name: build
# image: arm32v7/node:12.20.1-buster@sha256:37d6f1cfdef57f170dce16d72ed21c5d463bed4a6ed340c056ef91cb94e39199
# image: arm32v7/node:12.21.0-buster@sha256:e93d480d761345d85d283fba41585c6906c28d1670fa7f9581ead8aadf56e583
# commands:
# - npm install
# - npm run build:ssr

View file

@ -4,7 +4,7 @@ FROM arm32v7/alpine:3.12.3@sha256:299294be8699c1b323c137f972fd0aa5eaa4b95489c213
FROM arm64v8/alpine:3.12.3@sha256:549694ea68340c26d1d85c00039aa11ad835be279bfd475ff4284b705f92c24e AS base-arm64
FROM base-${ARCH}
RUN apk --no-cache add nodejs="12.20.1-r0"
RUN apk --no-cache add nodejs="12.21.0-r0"
COPY dist/universal-statuspage /universal-statuspage

View file

@ -26,8 +26,8 @@
"@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",
"@fortawesome/fontawesome-free": "^5.15.3",
"@nguniversal/express-engine": "^11.2.1",
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"@types/node-cron": "^2.0.3",
@ -36,8 +36,8 @@
"dayjs": "^1.10.4",
"express": "^4.17.1",
"flag-icon-css": "^3.5.0",
"jsonpath-plus": "^5.0.2",
"node-cron": "^2.0.3",
"jsonpath-plus": "^5.0.4",
"node-cron": "^3.0.0",
"roboto-fontface": "^0.10.0",
"rxjs": "~6.6.3",
"tslib": "^2.1.0",
@ -49,7 +49,7 @@
"@angular/cli": "~11.1.1",
"@angular/compiler-cli": "~11.1.0",
"@angular/language-service": "~11.1.0",
"@nguniversal/builders": "^11.1.0",
"@nguniversal/builders": "^11.2.1",
"@types/express": "^4.17.11",
"@types/node": "^14.14.22",
"@types/jasmine": "~3.6.3",