From d081d4ec82761dae6f2c6222d427e74c176a6a13 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 11 Aug 2022 11:29:55 +0200 Subject: [PATCH 01/18] test woodpecker pipeline --- .woodpecker/.test.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .woodpecker/.test.yml diff --git a/.woodpecker/.test.yml b/.woodpecker/.test.yml new file mode 100644 index 0000000..3961db6 --- /dev/null +++ b/.woodpecker/.test.yml @@ -0,0 +1,7 @@ +pipeline: + build: + image: node:lts-buster-slim + commands: + - npm install + - npm run test + - npm run build -- 2.40.1 From d379b689ef80e31ac5c522fe421bb6dcc723ece2 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 11 Aug 2022 14:16:10 +0200 Subject: [PATCH 02/18] add build pipeline for non master changes --- .woodpecker/.next.yaml | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .woodpecker/.next.yaml diff --git a/.woodpecker/.next.yaml b/.woodpecker/.next.yaml new file mode 100644 index 0000000..dbedcab --- /dev/null +++ b/.woodpecker/.next.yaml @@ -0,0 +1,55 @@ +depends_on: + - test + +when: + branch: + exclude: + - master + +pipeline: + buildNext: + image: woopeckerci/plugin-docker-buildx + settings: + dry_run: true + repo: ocram85/blog + dockerfile: Dockerfile + tags: "next" + build_args: + - NODE_BASE=lts-buster-slim + - NGINX_BASE=1.21.6-alpine + username: + from_secret: hub_user + password: + from_secret: hub_passwd + when: + event: + - pull_request + + trivy: + image: aquasec/trivy:0.24.3 + commands: + - | + trivy image \ + --severity UNKNOWN,LOW,MEDIUM \ + --no-progress \ + ocram85/blog:next + - | + trivy image \ + --exit-code 1 \ + --severity HIGH,CRITICAL \ + --no-progress \ + ocram85/blog:next + when: + event: + - pull_request + + triggerPortainer: + image: ocram85/portainer-serviceupdate + settings: + #VERBOSE: true + URI: "https://portainer.ocram85.com" + TOKEN: + from_secret: NEXT_TOKEN + when: + event: + - pull_request -- 2.40.1 From 05efa609f18648c88351fdd7d17458d1f1c5acb0 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 11 Aug 2022 14:22:06 +0200 Subject: [PATCH 03/18] fix file extension --- .woodpecker/{.next.yaml => .next.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .woodpecker/{.next.yaml => .next.yml} (100%) diff --git a/.woodpecker/.next.yaml b/.woodpecker/.next.yml similarity index 100% rename from .woodpecker/.next.yaml rename to .woodpecker/.next.yml -- 2.40.1 From d1cb7b0c178ef9202b279cf1e7c42062bf0ec0f0 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 11 Aug 2022 14:30:15 +0200 Subject: [PATCH 04/18] simplify pipeline --- .woodpecker/.next.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index dbedcab..dadfdb7 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -1,11 +1,6 @@ depends_on: - test -when: - branch: - exclude: - - master - pipeline: buildNext: image: woopeckerci/plugin-docker-buildx @@ -13,7 +8,7 @@ pipeline: dry_run: true repo: ocram85/blog dockerfile: Dockerfile - tags: "next" + tags: next build_args: - NODE_BASE=lts-buster-slim - NGINX_BASE=1.21.6-alpine @@ -22,8 +17,7 @@ pipeline: password: from_secret: hub_passwd when: - event: - - pull_request + event: pull_request trivy: image: aquasec/trivy:0.24.3 @@ -40,8 +34,7 @@ pipeline: --no-progress \ ocram85/blog:next when: - event: - - pull_request + event: pull_request triggerPortainer: image: ocram85/portainer-serviceupdate @@ -51,5 +44,4 @@ pipeline: TOKEN: from_secret: NEXT_TOKEN when: - event: - - pull_request + event: pull_request -- 2.40.1 From e68d8adef9ee1782463078e8c8f0bb863ec7bbdc Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 11 Aug 2022 14:35:33 +0200 Subject: [PATCH 05/18] test native drone plugin --- .woodpecker/.next.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index dadfdb7..bd79b73 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -3,7 +3,7 @@ depends_on: pipeline: buildNext: - image: woopeckerci/plugin-docker-buildx + image: plugins/docker settings: dry_run: true repo: ocram85/blog -- 2.40.1 From a16e6be473737e7398e30ff8cd8d8892025753bb Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 11 Aug 2022 14:39:29 +0200 Subject: [PATCH 06/18] bump alpine base image version --- .woodpecker/.next.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index bd79b73..45f215e 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -11,7 +11,7 @@ pipeline: tags: next build_args: - NODE_BASE=lts-buster-slim - - NGINX_BASE=1.21.6-alpine + - NGINX_BASE=1.23.1-alpine username: from_secret: hub_user password: -- 2.40.1 From f68288c63fb64c6dc8a88b5b1e14ac152ed10739 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Fri, 12 Aug 2022 10:59:00 +0200 Subject: [PATCH 07/18] push test image to repo --- .woodpecker/.next.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index 45f215e..2b76f0a 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -5,7 +5,7 @@ pipeline: buildNext: image: plugins/docker settings: - dry_run: true + #dry_run: true repo: ocram85/blog dockerfile: Dockerfile tags: next @@ -18,6 +18,9 @@ pipeline: from_secret: hub_passwd when: event: pull_request + branch: + exclude: + - master trivy: image: aquasec/trivy:0.24.3 @@ -35,6 +38,9 @@ pipeline: ocram85/blog:next when: event: pull_request + branch: + exclude: + - master triggerPortainer: image: ocram85/portainer-serviceupdate -- 2.40.1 From c9dd998be7de60589cdf6d247ab7d0d4fc5f5dc6 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Fri, 12 Aug 2022 11:02:47 +0200 Subject: [PATCH 08/18] revert branch exclude --- .woodpecker/.next.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index 2b76f0a..e0e8e87 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -18,9 +18,6 @@ pipeline: from_secret: hub_passwd when: event: pull_request - branch: - exclude: - - master trivy: image: aquasec/trivy:0.24.3 -- 2.40.1 From 69f362a585d72811531139729d4d29a236ba7cf4 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Fri, 12 Aug 2022 11:04:43 +0200 Subject: [PATCH 09/18] revert changes --- .woodpecker/.next.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index e0e8e87..12f5a55 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -35,9 +35,6 @@ pipeline: ocram85/blog:next when: event: pull_request - branch: - exclude: - - master triggerPortainer: image: ocram85/portainer-serviceupdate -- 2.40.1 From e5692afaf065718aa224eb74aac0e4deb75e3f46 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Fri, 12 Aug 2022 11:17:22 +0200 Subject: [PATCH 10/18] fix pipeline name --- .woodpecker/.next.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index 12f5a55..96f8998 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -19,7 +19,7 @@ pipeline: when: event: pull_request - trivy: + trivyNext: image: aquasec/trivy:0.24.3 commands: - | -- 2.40.1 From c9718ee878bc81ff1ff0f98b757508279be9a495 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Fri, 12 Aug 2022 11:17:33 +0200 Subject: [PATCH 11/18] add master pipeline --- .woodpecker/.master.yml | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .woodpecker/.master.yml diff --git a/.woodpecker/.master.yml b/.woodpecker/.master.yml new file mode 100644 index 0000000..2a7f3fd --- /dev/null +++ b/.woodpecker/.master.yml @@ -0,0 +1,49 @@ +depends_on: + - test + +pipeline: + buildMaster: + image: plugins/docker + settings: + repo: ocram85/blog + dockerfile: Dockerfile + auto_tag: true + 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: push + branch: master + + trivyMaster: + image: aquasec/trivy:0.24.3 + commands: + - | + trivy image \ + --severity UNKNOWN,LOW,MEDIUM \ + --no-progress \ + ocram85/blog:next + - | + trivy image \ + --exit-code 1 \ + --severity HIGH,CRITICAL \ + --no-progress \ + ocram85/blog:latest + when: + event: push + branch: master + + triggerPortainerMaster: + image: ocram85/portainer-serviceupdate + settings: + #VERBOSE: true + URI: "https://portainer.ocram85.com" + TOKEN: + from_secret: TOKEN + when: + event: push + branch: master -- 2.40.1 From 7e6c5299d8b8b6e41d7779134067591773fe74a3 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Tue, 13 Sep 2022 08:53:53 +0200 Subject: [PATCH 12/18] disable drone pipeline --- .drone.yml => .drone.yml.bak | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .drone.yml => .drone.yml.bak (100%) diff --git a/.drone.yml b/.drone.yml.bak similarity index 100% rename from .drone.yml rename to .drone.yml.bak -- 2.40.1 From edf0698b4cf159d0a194df9e13bcdfbf9c1d8d10 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Tue, 13 Sep 2022 12:59:11 +0200 Subject: [PATCH 13/18] add gitea package registry --- .woodpecker/.next.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index 96f8998..eec1ab5 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -19,6 +19,24 @@ pipeline: when: event: pull_request + buildNextGitea: + image: plugins/docker + settings: + #dry_run: true + registry: gitea.ocram85.com + repo: 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: -- 2.40.1 From ee7865dc257202db20f9221fb7467819b7b509cc Mon Sep 17 00:00:00 2001 From: OCram85 Date: Tue, 13 Sep 2022 13:02:31 +0200 Subject: [PATCH 14/18] fix lowercase for repo artifact names --- .woodpecker/.next.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index eec1ab5..bbefe9a 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -24,7 +24,7 @@ pipeline: settings: #dry_run: true registry: gitea.ocram85.com - repo: OCram85/Blog + repo: ocram85/blog dockerfile: Dockerfile tags: next build_args: -- 2.40.1 From c4bdbabd26adb8e6b5faebbfd33e35b0a77cd606 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Tue, 13 Sep 2022 13:07:17 +0200 Subject: [PATCH 15/18] fix custom registry / repo syntax --- .woodpecker/.next.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index bbefe9a..f1ba531 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -24,7 +24,7 @@ pipeline: settings: #dry_run: true registry: gitea.ocram85.com - repo: ocram85/blog + repo: gitea.ocram85.com/ocram85/blog dockerfile: Dockerfile tags: next build_args: -- 2.40.1 From ddc5724812b8744cac20efe83522cbc2e63d7cb2 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Tue, 13 Sep 2022 13:12:38 +0200 Subject: [PATCH 16/18] test --- .woodpecker/.next.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index f1ba531..c14b7d0 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -24,7 +24,7 @@ pipeline: settings: #dry_run: true registry: gitea.ocram85.com - repo: gitea.ocram85.com/ocram85/blog + repo: gitea.ocram85.com/ocram85/Blog dockerfile: Dockerfile tags: next build_args: -- 2.40.1 From b4179c74d0778fc913632a12c602ffdf2fbc91be Mon Sep 17 00:00:00 2001 From: OCram85 Date: Tue, 13 Sep 2022 13:18:36 +0200 Subject: [PATCH 17/18] revert test repo casing --- .woodpecker/.next.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml index c14b7d0..f1ba531 100644 --- a/.woodpecker/.next.yml +++ b/.woodpecker/.next.yml @@ -24,7 +24,7 @@ pipeline: settings: #dry_run: true registry: gitea.ocram85.com - repo: gitea.ocram85.com/ocram85/Blog + repo: gitea.ocram85.com/ocram85/blog dockerfile: Dockerfile tags: next build_args: -- 2.40.1 From df7fb42cee7da93547829ef205cca845d5b28925 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Tue, 13 Sep 2022 13:18:52 +0200 Subject: [PATCH 18/18] ass gitea package deployment --- .woodpecker/.master.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.master.yml b/.woodpecker/.master.yml index 2a7f3fd..ca56ff2 100644 --- a/.woodpecker/.master.yml +++ b/.woodpecker/.master.yml @@ -19,6 +19,24 @@ pipeline: event: push branch: master + buildMasterGitea: + image: plugins/docker + settings: + registry: gitea.ocram85.com + repo: gitea.ocram85.com/ocram85/blog + dockerfile: Dockerfile + auto_tag: true + 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: push + branch: master + trivyMaster: image: aquasec/trivy:0.24.3 commands: @@ -26,7 +44,7 @@ pipeline: trivy image \ --severity UNKNOWN,LOW,MEDIUM \ --no-progress \ - ocram85/blog:next + ocram85/blog:latest - | trivy image \ --exit-code 1 \ -- 2.40.1