Merge branch 'master' into links

.changelog.yml

@@ -1,38 +0,0 @@
-# The full repository name
-repo: OCram85/Blog
-
-# Service type (gitea or github)
-service: gitea
-
-# Base URL for Gitea instance if using gitea service type (optional)
-# Default: https://gitea.com
-base-url: https://gitea.ocram85.com
-
-# Changelog groups and which labeled PRs to add to each group
-groups:
-  - name: 🐛 BUGFIXES
-    labels:
-      - bug
-  - name: ✨ FEATURES
-    labels:
-      - feature
-  - name: 🛠️ ENHANCEMENTS
-    labels:
-      - enhancement
-  - name: 📦 BUILD
-    labels:
-      - pipeline
-  - name: 🤖 DEPENDENCIES
-    labels:
-      - renovate
-  - name: 📚 DOCS
-    labels:
-      - docs
-  - name: ⚙️ META
-    labels:
-      - meta
-  - name: 🔖 MISC
-    default: true
-
-# regex indicating which labels to skip for the changelog
-skip-labels: skip-changelog|backport\/.+

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@
 
 > :bulb: Select your test plan for the code changes.
 
-- [x] CI pipeline
+- [ ] Tested via CI pipeline
 - [ ] Custom test
 - [ ] No test plan
 

.vscode/dictionaries/project-words.txt

@@ -2,7 +2,4 @@ CAFS
 gitea
 gitlocal
 hashtable
-lastmod
-UCS
 umami
-Veyor

.woodpecker/.master.yml

@@ -38,7 +38,7 @@ pipeline:
       branch: master
 
   trivyMaster:
-    image: aquasec/trivy:0.35.0
+    image: aquasec/trivy:0.24.3
     commands:
       - |
         trivy image \
@@ -47,6 +47,7 @@ pipeline:
           ocram85/blog:latest
       - |
         trivy image \
+          --exit-code 1 \
           --severity HIGH,CRITICAL \
           --no-progress \
           ocram85/blog:latest

.woodpecker/.next.yml

@@ -3,11 +3,15 @@ depends_on:
 
 pipeline:
   buildNext:
-    image: woodpeckerci/plugin-docker-buildx
+    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:
@@ -16,12 +20,16 @@ pipeline:
       event: pull_request
 
   buildNextGitea:
-    image: woodpeckerci/plugin-docker-buildx
+    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:
@@ -30,7 +38,7 @@ pipeline:
       event: pull_request
 
   trivyNext:
-    image: aquasec/trivy:0.35.0
+    image: aquasec/trivy:0.24.3
     commands:
       - |
         trivy image \
@@ -39,6 +47,7 @@ pipeline:
           ocram85/blog:next
       - |
         trivy image \
+          --exit-code 1 \
           --severity HIGH,CRITICAL \
           --no-progress \
           ocram85/blog:next

.woodpecker/renovate.yml

@@ -1,22 +0,0 @@
-pipeline:
-  DockerBaseImage:
-    image: renovate/renovate:34.63-slim
-    commands:
-      - "renovate"
-    secrets:
-      - RENOVATE_TOKEN
-    environment:
-      #LOG_LEVEL: debug
-      RENOVATE_PLATFORM: "gitea"
-      RENOVATE_ENDPOINT: "https://gitea.ocram85.com"
-      RENOVATE_REPOSITORIES: "${CI_REPO}"
-      RENOVATE_LABELS: "renovate"
-      #RENOVATE_DRY_RUN: "full"
-      RENOVATE_TOKEN: "${RENOVATE_TOKEN}"
-      RENOVATE_GITHUB_TOKEN_WARN: "false"
-    when:
-      event:
-        - push
-      branch:
-        - master
-        - updDeps

Dockerfile

@@ -1,4 +1,8 @@
-FROM node:lts-buster-slim as builder
+# 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
 COPY . /src
 #RUN ls -la
 WORKDIR /src
@@ -6,7 +10,7 @@ WORKDIR /src
 RUN npm install \
   && npm run build
 
-FROM nginx:1.23.3-alpine as prod
+FROM nginx:${NGINX_BASE} 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

config/_default/languages.en.toml

@@ -6,7 +6,7 @@ weight = 1
 rtl = false
 
 title = "OCram85.com"
-#logo = "img/logo_square.png"
+logo = "img/logo_square.png"
 description = "A personal blog about PowerShell, Automation and more."
 # copyright = "Copy, _right?_ :thinking_face:"
 

config/_default/menus.en.toml

@@ -30,10 +30,10 @@
   pageRef = "aboutme"
   weight = 40
 
-#[[main]]
+[[main]]
-#  name = "Code"
+  name = "Code"
-#  url = "https://gitea.ocram85.com"
+  url = "https://gitea.ocram85.com"
-#  weight = 50
+  weight = 50
 
 
 # -- Footer Menu --
@@ -55,13 +55,8 @@
   url = "https://umami.ocram85.com/share/KAk7LmbU/Blog"
   weight = 30
 
-[[footer]]
-  name = "Code"
-  url = "https://gitea.ocram85.com"
-  weight = 40
-
 [[footer]]
   name = "CI"
   url = "https://ci.ocram85.com"
-  weight = 50
+  weight = 40
 

config/_default/params.toml

@@ -8,22 +8,13 @@
 colorScheme = "avocado"
 defaultAppearance = "dark" # valid options: light or dark
 autoSwitchAppearance = false
+showAppearanceSwitcher = false
 
 enableSearch = true
 enableCodeCopy = true
 
 # mainSections = ["section1", "section2"]
 # robots = ""
-
-[header]
-  layout = "hamburger" # valid options: basic, hamburger, hybrid, custom
-  logo = "img/logo_square.png"
-  showTitle = false
-
-[footer]
-  showCopyright = true
-  showThemeAttribution = true
-  showAppearanceSwitcher = false
 showScrollToTop = true
 
 [homepage]
@@ -37,7 +28,7 @@ enableCodeCopy = true
   showBreadcrumbs = false
   showDraftLabel = true
   showEdit = true
-  editURL = "https://gitea.ocram85.com/OCram85/Blog/_edit/psCredUpdate/content/"
+  editURL = "https://github.com/OCram85/Blog/edit/master/content/"
   editAppendPath = true
   showHeadingAnchors = true
   showPagination = true
@@ -46,16 +37,13 @@ enableCodeCopy = true
   showTableOfContents = true
   showTaxonomies = true
   showWordCount = true
-  showComments = false
   sharingLinks = ["facebook", "twitter", "pinterest", "reddit", "linkedin", "email"]
 
 [list]
   showBreadcrumbs = false
   showSummary = false
   showTableOfContents = false
-  showTaxonomies = false
   groupByYear = true
-  paginationWidth = 1
 
 [sitemap]
   excludedKinds = ["taxonomy", "term"]

content/posts/pi-hole-as-docker-swarm-stack/index.md

@@ -16,6 +16,8 @@ tags: ['pihole', 'swarm', 'stack']
 # sharingLinks: [null]
 ---
 
+{{< figure src="black-hole.jpg" width="600" height="800" caption="Photo by Kamesh Vedula on Unsplash." >}}
+
 ## Intro
 
 Many of you already know [Pi-hole](https://pi-hole.net/) as a trusted DNS firewall solution in your home labs. But

content/posts/pscredentialstore-update/index.md

@@ -1,59 +0,0 @@
----
-title: "✨ PSCredentialStore 1.1.0 is released"
-date: 2022-09-21T10:14:18+02:00
-draft: false
-
-categories: ['Projects']
-tags: ['PSCredentialStore']
-
-# lastmod: 2022-09-21T10:14:18+02:00
-# showDateUpdated: true
-
-# custom overrides for pages
-# showDate: false
-# showAuthor: false
-# showWordCount: false
-# showReadingTime: false
-# showTableOfContents: false
-# showTaxonomies: true
-# showEdit: false
-# sharingLinks: [null]
----
-
-<p align="right">
-  <img src="https://forthebadge.com/images/badges/built-with-love.svg">
-</p>
-
-Today I'm proud to present the release of PSCredentialStore version [1.1.0](https://www.powershellgallery.com/packages/PSCredentialStore/1.1.0).
-
-This version was mainly focused on updating the build pipeline and codebase.
-So let me explain the changes in detail:
-
-- 🧰 Reworked the build pipeline and replace Travis, AppVeyor by Drone.IO.
-- 🧰 Updated the PowerShell style to the lates community standards.
-- 🧰 Migrated from Github to [self hosted Gitea](https://gitea.ocram85.com/OCram85/PSCredentialStore).
-- 🧰 Migrated to self hosted Drone and Woodpecker CI.
-- 🧰 Updated Pester unit tests to Pester5+ syntax.
-- 💣 Changed from MIT to GNU AGPLv3 license.
-- 🧰 Removed the optional dependency helper.
-- 📦 Updated embedded OpenSSL (LibreSSL) files to version 3.5.3.
-  - Started building and deploying the LibreSSL windows portable version on Github: https://github.com/OCram85/libressl-portable.
-- 🧰 Added gitea project template files for issues and pull requests.
-- 🤖 Implemented [DroneHelper](https://gitea.ocram85.com/OCram85/DroneHelper) base Drone pipeline.
-
-Additionally we fixed some issues and added new connection types:
-
-- 🌟 Added CiscoUCSCentral connection type
-- 🐛 Fixed `Test-CredentialStoreItem` output
-- 🐛 Fixed CiscoUCS connection
-
-You can find the PSCredential store at [PowerShell Gallery](https://www.powershellgallery.com/packages/PSCredentialStore)
-and [gitea.ocram85.com](https://gitea.ocram85.com/OCram85/PSCredentialStore/releases).
-
-Feel free to install or upgrade to the latest version with the following command.
-
-```powershell
-Install-Module -Name 'PSCredentialStore' -Force
-```
-
-![forthebadge](https://forthebadge.com/images/badges/contains-17-coffee-cups.svg)

content/posts/psmodulebase/index.md

@@ -19,6 +19,8 @@ tags: ['ModuleBase', 'config']
 # sharingLinks: [null]
 ---
 
+![note](note.jpg 'Photo by [Sigmund](https://unsplash.com/@sigmund) on [Unsplash](https://unsplash.com)')
+
 ## 🖼️ Intro
 
 This article explains with a practical example how to determine and use the current module base path.

content/posts/pstypename/index.md

@@ -18,6 +18,8 @@ showDateUpdated: true
 # sharingLinks: [null]
 ---
 
+![ship](ship.jpg 'Photo by [Rod Long](https://unsplash.com/@rodlong) on [Unsplash](https://unsplash.com)')
+
 ## 🖼️ Intro
 
 This post explains how to use `PSCustomObject`s as function parameters. We compare the basic usage with an

content/posts/pwsh-read-only-class-properties/index.md

@@ -18,6 +18,9 @@ tags: ['class', 'read-only', 'properties']
 # showEdit: false
 # sharingLinks: [null]
 ---
+
+{{< figure src="vader_cube.png" width="800" height="800">}}
+
 {{< note >}}
 If you're not familiar with Powershell classes I suggest you reading this awesome blog article from Michael Willis
 [Powershell v5 Classes & Concepts](https://xainey.github.io/2016/powershell-classes-and-concepts/). It covers

content/posts/pwsh-resources/index.md

@@ -9,6 +9,8 @@ tags: ['resources']
 draft: false
 ---
 
+{{< figure src="res-posh.jpg" width="1200" height="800" caption="Photo by Eugenio Mazzone on Unsplash." >}}
+
 ## The Journey Begins Now Young Novice
 
 In this section you find the most basic stuff. It's aimed to help beginners who just got in touch with PowerShell.

content/posts/releases/arkanum-v0.2.0/index.md

@@ -1,28 +0,0 @@
----
-title: "✨ Arkanum 0.2.0 is released"
-date: 2023-01-04T10:00:00+02:00
-draft: false
-section: 'posts'
-
-categories: ['Projects']
-tags: ['Arkanum']
-
-# lastmod: 2022-09-21T10:14:18+02:00
-# showDateUpdated: true
-
-# custom overrides for pages
-# showDate: false
-# showAuthor: false
-# showWordCount: false
-# showReadingTime: false
-# showTableOfContents: false
-# showTaxonomies: true
-# showEdit: false
-# sharingLinks: [null]
----
-
-<p align="right">
-  <img src="https://forthebadge.com/images/badges/built-with-love.svg">
-</p>
-
-Today I'm proud to present the release of [Arkanum](https://gitea.ocram85.com/CodeServer/arkanum) version [0.2.0](https://gitea.ocram85.com/CodeServer/-/packages/container/arkanum/0.2.0).

package.json

@@ -10,7 +10,6 @@
     "lint:markdown": "markdownlint \"*.md\" \"content/**/*.md\"",
     "start": "npm run server",
     "server": "exec-bin node_modules/.bin/hugo/hugo server --bind=0.0.0.0 -D",
-    "arkanum": "exec-bin node_modules/.bin/hugo/hugo server --bind=0.0.0.0 -D --appendPort=false --baseURL https://arkanum-dev.ocram85.com --port 1313",
     "test": "npm run lint:markdown",
     "postinstall": "hugo-installer --version otherDependencies.hugo --extended --destination node_modules/.bin/hugo",
     "new:post": "exec-bin node_modules/.bin/hugo/hugo new"
@@ -27,8 +26,8 @@
   "homepage": "https://github.com/OCram85/Blog#readme",
   "devDependencies": {
     "exec-bin": "^1.0.0",
-    "hugo-installer": "^4.0.0",
+    "hugo-installer": "^3.1.0",
-    "markdownlint-cli": "^0.32.0",
+    "markdownlint-cli": "^0.31.1",
     "rimraf": "^3.0.2"
   },
   "otherDependencies": {

renovate.json

@@ -1,18 +0,0 @@
-{
-  "onboardingConfig": {
-    "extends": [
-      "config:base"
-    ]
-  },
-  "dependencyDashboard": true,
-  "docker": {
-    "enabled": true
-  },
-  "docker-compose": {
-    "enabled": true
-  },
-  "woodpecker": {
-    "enabled": true,
-    "fileMatch": ["^.woodpecker\/.*.yml$"]
-  }
-}