From f334cfeefbbd3df392109861035bd7c548ba5237 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Wed, 7 Dec 2022 19:55:00 +0100 Subject: [PATCH] merge pipeline steps --- .woodpecker/next.yml | 73 +++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 25 deletions(-) diff --git a/.woodpecker/next.yml b/.woodpecker/next.yml index 4397037..372198b 100644 --- a/.woodpecker/next.yml +++ b/.woodpecker/next.yml @@ -2,40 +2,63 @@ 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 - username: - from_secret: hub_user - password: - from_secret: hub_passwd + logins: + - registry: https://index.docker.io/v1/ + username: + from_secret: hub_user + password: + from_secret: hub_passwd + - registry: https://gitea.ocram85.com + username: + from_secret: gitea_user + password: + from_secret: gitea_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 + #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