From 4f2c65b69f3e6587f1cb06ab7460993fdecdbae1 Mon Sep 17 00:00:00 2001
From: OCram85 <ocram85@noreply.local>
Date: Wed, 7 Dec 2022 20:26:35 +0100
Subject: [PATCH] debug woodpecker renovate (#29)

#### :book: Summary

- remove leading . in pipeline files.
- remove build arg for renovate support.

#### :bookmark_tabs: Test Plan

> :bulb: Select your test plan for the code changes.

- [x] Tested via CI pipeline
- [ ] Custom test
- [ ] No test plan

##### Details / Justification

<!-- Add your test details or justification for missing tests here. -->

#### :books: Additional Notes

<!-- A place for additional detail notes. -->

Co-authored-by: OCram85 <marco.blessing@googlemail.com>
Reviewed-on: https://gitea.ocram85.com/OCram85/Blog/pulls/29
---
 .woodpecker/{.master.yml => master.yml}     |  1 -
 .woodpecker/{.next.yml => next.yml}         | 13 ++-----------
 .woodpecker/{.renovate.yml => renovate.yml} |  4 ++--
 .woodpecker/{.test.yml => test.yml}         |  0
 Dockerfile                                  |  8 ++------
 renovate.json                               |  5 +++++
 6 files changed, 11 insertions(+), 20 deletions(-)
 rename .woodpecker/{.master.yml => master.yml} (98%)
 rename .woodpecker/{.next.yml => next.yml} (78%)
 rename .woodpecker/{.renovate.yml => renovate.yml} (87%)
 rename .woodpecker/{.test.yml => test.yml} (100%)

diff --git a/.woodpecker/.master.yml b/.woodpecker/master.yml
similarity index 98%
rename from .woodpecker/.master.yml
rename to .woodpecker/master.yml
index ca56ff2..c682d1e 100644
--- a/.woodpecker/.master.yml
+++ b/.woodpecker/master.yml
@@ -47,7 +47,6 @@ pipeline:
           ocram85/blog:latest
       - |
         trivy image \
-          --exit-code 1 \
           --severity HIGH,CRITICAL \
           --no-progress \
           ocram85/blog:latest
diff --git a/.woodpecker/.next.yml b/.woodpecker/next.yml
similarity index 78%
rename from .woodpecker/.next.yml
rename to .woodpecker/next.yml
index f1ba531..782aaaf 100644
--- a/.woodpecker/.next.yml
+++ b/.woodpecker/next.yml
@@ -3,15 +3,11 @@ depends_on:
 
 pipeline:
   buildNext:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     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:
@@ -20,16 +16,12 @@ pipeline:
       event: pull_request
 
   buildNextGitea:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     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:
@@ -47,7 +39,6 @@ pipeline:
           ocram85/blog:next
       - |
         trivy image \
-          --exit-code 1 \
           --severity HIGH,CRITICAL \
           --no-progress \
           ocram85/blog:next
diff --git a/.woodpecker/.renovate.yml b/.woodpecker/renovate.yml
similarity index 87%
rename from .woodpecker/.renovate.yml
rename to .woodpecker/renovate.yml
index 68df3d8..01d0298 100644
--- a/.woodpecker/.renovate.yml
+++ b/.woodpecker/renovate.yml
@@ -1,12 +1,12 @@
 pipeline:
   DockerBaseImage:
-    image: renovate/renovate:34.22-slim
+    image: renovate/renovate:34.40-slim
     commands:
       - "renovate"
     secrets:
       - RENOVATE_TOKEN
     environment:
-      #LOG_LEVEL: debug
+      LOG_LEVEL: debug
       RENOVATE_PLATFORM: "gitea"
       RENOVATE_ENDPOINT: "https://gitea.ocram85.com"
       RENOVATE_REPOSITORIES: "${CI_REPO}"
diff --git a/.woodpecker/.test.yml b/.woodpecker/test.yml
similarity index 100%
rename from .woodpecker/.test.yml
rename to .woodpecker/test.yml
diff --git a/Dockerfile b/Dockerfile
index ec0d09b..bc51729 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,4 @@
-# Build ARGS for base image versions
-ARG NODE_BASE=lts-buster-slim
-ARG NGINX_BASE=1.21.6-alpine
-
-FROM node:${NODE_BASE} as builder
+FROM node:lts-buster-slim as builder
 COPY . /src
 #RUN ls -la
 WORKDIR /src
@@ -10,7 +6,7 @@ WORKDIR /src
 RUN npm install \
   && npm run build
 
-FROM nginx:${NGINX_BASE} as prod
+FROM nginx:1.23.1-alpine as prod
 LABEL maintainer="marco.blessing@googlemail.com"
 HEALTHCHECK  --interval=15s --timeout=5s \
   CMD wget --no-verbose --tries=1 --spider http://localhost:80/ || exit 1
diff --git a/renovate.json b/renovate.json
index 97575a5..338f0a6 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,4 +1,9 @@
 {
+  "onboardingConfig": {
+    "extends": [
+      "config:base"
+    ]
+  },
   "dependencyDashboard": true,
   "docker": {
     "enabled": true