Merge branch 'develop' into renovate/docker-docker-images
Some checks reported errors
continuous-integration/drone/push Build was killed
continuous-integration/drone/pr Build is passing

This commit is contained in:
Samuel Philipp 2021-03-27 21:25:12 +00:00
commit 3eb8c9f7b0

View file

@ -60,47 +60,44 @@ trigger:
event: event:
- push - push
--- # disable temporarily
kind: pipeline #---
type: docker #kind: pipeline
name: linux-arm #type: docker
#name: linux-arm
platform: #
os: linux #platform:
arch: arm # os: linux
# arch: arm
steps: #
- name: build #steps:
image: arm32v7/node:12.21.0-buster@sha256:e93d480d761345d85d283fba41585c6906c28d1670fa7f9581ead8aadf56e583 # - name: build
commands: # image: arm32v7/node:12.21.0-buster@sha256:e93d480d761345d85d283fba41585c6906c28d1670fa7f9581ead8aadf56e583
- npm install # commands:
- npm run build:ssr # - npm install
- name: docker # - npm run build:ssr
image: plugins/docker # - name: docker
settings: # image: plugins/docker
auto_tag: true # settings:
auto_tag_suffix: linux-arm # auto_tag: true
repo: samuelph/universal-statuspage # auto_tag_suffix: linux-arm
username: # repo: samuelph/universal-statuspage
from_secret: USERNAME # username:
password: # from_secret: USERNAME
from_secret: PASSWORD # password:
# from_secret: PASSWORD
trigger: #
branch: #trigger:
- main # branch:
event: # - main
- push # event:
# - push
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
name: manifest name: manifest
platform:
os: linux
arch: arm64
steps: steps:
- name: publish - name: publish
image: plugins/manifest image: plugins/manifest
@ -112,7 +109,7 @@ steps:
platforms: platforms:
- linux/amd64 - linux/amd64
- linux/arm64 - linux/arm64
- linux/arm # - linux/arm
username: username:
from_secret: USERNAME from_secret: USERNAME
password: password:
@ -121,7 +118,7 @@ steps:
depends_on: depends_on:
- linux-amd64 - linux-amd64
- linux-arm64 - linux-arm64
- linux-arm # - linux-arm
trigger: trigger:
branch: branch: