Merge pull request 'develop' (#128) from develop into main
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #128
This commit is contained in:
commit
c63d2f0545
3 changed files with 47 additions and 50 deletions
75
.drone.yml
75
.drone.yml
|
|
@ -8,7 +8,7 @@ platform:
|
|||
|
||||
steps:
|
||||
- name: build
|
||||
image: amd64/node:12.20.1-buster@sha256:ce4f3c9c90400203824d1029f068fd826e2ec64226f2109eb0745681550e5972
|
||||
image: amd64/node:12.22.1-buster@sha256:436a6432b6f5109c2c70a1f71f5df0e7d29946a967e85882fe08a37f36b8bec4
|
||||
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.22.1-buster@sha256:beece4c83b620cd54f88d2f16da50c41f62c19a1e8591354ad82726d43d5605a
|
||||
commands:
|
||||
- npm install
|
||||
- npm run build:ssr
|
||||
|
|
@ -60,47 +60,44 @@ trigger:
|
|||
event:
|
||||
- push
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
name: linux-arm
|
||||
|
||||
platform:
|
||||
os: linux
|
||||
arch: arm
|
||||
|
||||
steps:
|
||||
- name: build
|
||||
image: arm32v7/node:12.20.1-buster@sha256:37d6f1cfdef57f170dce16d72ed21c5d463bed4a6ed340c056ef91cb94e39199
|
||||
commands:
|
||||
- npm install
|
||||
- npm run build:ssr
|
||||
- name: docker
|
||||
image: plugins/docker
|
||||
settings:
|
||||
auto_tag: true
|
||||
auto_tag_suffix: linux-arm
|
||||
repo: samuelph/universal-statuspage
|
||||
username:
|
||||
from_secret: USERNAME
|
||||
password:
|
||||
from_secret: PASSWORD
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
- main
|
||||
event:
|
||||
- push
|
||||
# disable temporarily
|
||||
#---
|
||||
#kind: pipeline
|
||||
#type: docker
|
||||
#name: linux-arm
|
||||
#
|
||||
#platform:
|
||||
# os: linux
|
||||
# arch: arm
|
||||
#
|
||||
#steps:
|
||||
# - name: build
|
||||
# image: arm32v7/node:12.21.0-buster@sha256:e93d480d761345d85d283fba41585c6906c28d1670fa7f9581ead8aadf56e583
|
||||
# commands:
|
||||
# - npm install
|
||||
# - npm run build:ssr
|
||||
# - name: docker
|
||||
# image: plugins/docker
|
||||
# settings:
|
||||
# auto_tag: true
|
||||
# auto_tag_suffix: linux-arm
|
||||
# repo: samuelph/universal-statuspage
|
||||
# username:
|
||||
# from_secret: USERNAME
|
||||
# password:
|
||||
# from_secret: PASSWORD
|
||||
#
|
||||
#trigger:
|
||||
# branch:
|
||||
# - main
|
||||
# event:
|
||||
# - push
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
name: manifest
|
||||
|
||||
platform:
|
||||
os: linux
|
||||
arch: arm64
|
||||
|
||||
steps:
|
||||
- name: publish
|
||||
image: plugins/manifest
|
||||
|
|
@ -112,7 +109,7 @@ steps:
|
|||
platforms:
|
||||
- linux/amd64
|
||||
- linux/arm64
|
||||
- linux/arm
|
||||
# - linux/arm
|
||||
username:
|
||||
from_secret: USERNAME
|
||||
password:
|
||||
|
|
@ -121,7 +118,7 @@ steps:
|
|||
depends_on:
|
||||
- linux-amd64
|
||||
- linux-arm64
|
||||
- linux-arm
|
||||
# - linux-arm
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
|
|
|
|||
|
|
@ -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.20.1-r0"
|
||||
RUN apk --no-cache add nodejs="12.22.1-r0"
|
||||
|
||||
COPY dist/universal-statuspage /universal-statuspage
|
||||
|
||||
|
|
|
|||
14
package.json
14
package.json
|
|
@ -26,18 +26,18 @@
|
|||
"@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": "^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.2",
|
||||
"node-cron": "^2.0.3",
|
||||
"jsonpath-plus": "^5.1.0",
|
||||
"node-cron": "^3.0.0",
|
||||
"roboto-fontface": "^0.10.0",
|
||||
"rxjs": "~6.6.3",
|
||||
"tslib": "^2.1.0",
|
||||
|
|
@ -49,8 +49,8 @@
|
|||
"@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",
|
||||
"@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",
|
||||
|
|
|
|||
Reference in a new issue