merge pipeline steps
Some checks failed
ci/woodpecker/pr/renovate Pipeline was successful
ci/woodpecker/push/renovate Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/pr/test Pipeline was successful
ci/woodpecker/push/next Pipeline was successful
ci/woodpecker/push/master Pipeline was successful
ci/woodpecker/pr/master Pipeline was successful
ci/woodpecker/pr/next Pipeline failed

This commit is contained in:
OCram85 2022-12-07 19:55:00 +01:00
parent f6f112e247
commit f334cfeefb

View File

@ -2,34 +2,22 @@ depends_on:
- test
pipeline:
buildNext:
image: plugins/docker
build:
image: woodpeckerci/plugin-docker-buildx
settings:
#dry_run: true
repo: ocram85/blog
repo: ocram85/blog, gitea.ocram85.com/ocram85/blog
dockerfile: Dockerfile
tags: next
build_args:
- NODE_BASE=lts-buster-slim
- NGINX_BASE=1.23.1-alpine
logins:
- registry: https://index.docker.io/v1/
username:
from_secret: hub_user
password:
from_secret: hub_passwd
when:
event: pull_request
buildNextGitea:
image: plugins/docker
settings:
#dry_run: true
registry: gitea.ocram85.com
repo: gitea.ocram85.com/ocram85/blog
dockerfile: Dockerfile
tags: next
build_args:
- NODE_BASE=lts-buster-slim
- NGINX_BASE=1.23.1-alpine
- registry: https://gitea.ocram85.com
username:
from_secret: gitea_user
password:
@ -37,6 +25,41 @@ pipeline:
when:
event: pull_request
#buildNext:
# image: plugins/docker
# settings:
# #dry_run: true
# repo: ocram85/blog
# dockerfile: Dockerfile
# tags: next
# build_args:
# - NODE_BASE=lts-buster-slim
# - NGINX_BASE=1.23.1-alpine
# username:
# from_secret: hub_user
# password:
# from_secret: hub_passwd
# when:
# event: pull_request
#
#buildNextGitea:
# image: plugins/docker
# settings:
# #dry_run: true
# registry: gitea.ocram85.com
# repo: gitea.ocram85.com/ocram85/blog
# dockerfile: Dockerfile
# tags: next
# build_args:
# - NODE_BASE=lts-buster-slim
# - NGINX_BASE=1.23.1-alpine
# username:
# from_secret: gitea_user
# password:
# from_secret: gitea_passwd
# when:
# event: pull_request
trivyNext:
image: aquasec/trivy:0.24.3
commands: