Browse Source

Merge remote-tracking branch 'origin/develop' into develop

pull/113/head
Samuel Philipp 11 months ago
parent
commit
537604b828
Signed by: samuel-p
GPG Key ID: 2AD495D17760CB4E
  1. 4
      .drone.yml
  2. 8
      Dockerfile
  3. 10
      package.json

4
.drone.yml

@ -8,7 +8,7 @@ platform:
steps:
- name: build
image: amd64/node:12.21.0-buster@sha256:e56a70a93f79dcf6b22104495ea4dc03ebb266123040455ccb4960910c668a1c
image: amd64/node:12.22.1-buster@sha256:436a6432b6f5109c2c70a1f71f5df0e7d29946a967e85882fe08a37f36b8bec4
commands:
- npm install
- npm run build:ssr
@ -41,7 +41,7 @@ platform:
steps:
- name: build
image: arm64v8/node:12.21.0-buster@sha256:d96d100df72d0f862f5338414489e5847cda289807fb069064a5c57ee5a941c5
image: arm64v8/node:12.22.1-buster@sha256:beece4c83b620cd54f88d2f16da50c41f62c19a1e8591354ad82726d43d5605a
commands:
- npm install
- npm run build:ssr

8
Dockerfile

@ -1,10 +1,10 @@
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 amd64/alpine:3.14.0@sha256:1775bebec23e1f3ce486989bfc9ff3c4e951690df84aa9f926497d82f2ffca9d AS base-amd64
FROM arm32v7/alpine:3.14.0@sha256:8d99168167baa6a6a0d7851b9684625df9c1455116a9601835c2127df2aaa2f5 AS base-arm
FROM arm64v8/alpine:3.14.0@sha256:53b74ddfc6225e3c8cc84d7985d0f34666e4e8b0b6892a9b2ad1f7516bc21b54 AS base-arm64
FROM base-${ARCH}
RUN apk --no-cache add nodejs="12.21.0-r0"
RUN apk --no-cache add nodejs="12.22.1-r0"
COPY dist/universal-statuspage /universal-statuspage

10
package.json

@ -27,16 +27,16 @@
"@angular/platform-server": "~11.1.0",
"@angular/router": "~11.1.0",
"@fortawesome/fontawesome-free": "^5.15.3",
"@nguniversal/express-engine": "^11.2.1",
"@nguniversal/express-engine": "^12.0.2",
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"@types/node-cron": "^2.0.3",
"bootstrap": "^4.6.0",
"cron": "^1.8.2",
"dayjs": "^1.10.4",
"dayjs": "^1.10.5",
"express": "^4.17.1",
"flag-icon-css": "^3.5.0",
"jsonpath-plus": "^5.0.4",
"jsonpath-plus": "^5.1.0",
"node-cron": "^3.0.0",
"roboto-fontface": "^0.10.0",
"rxjs": "~6.6.3",
@ -49,8 +49,8 @@
"@angular/cli": "~11.1.1",
"@angular/compiler-cli": "~11.1.0",
"@angular/language-service": "~11.1.0",
"@nguniversal/builders": "^11.2.1",
"@types/express": "^4.17.11",
"@nguniversal/builders": "^12.0.2",
"@types/express": "^4.17.12",
"@types/node": "^14.14.22",
"@types/jasmine": "~3.6.3",
"@types/jasminewd2": "~2.0.8",

Loading…
Cancel
Save