.dockerignore

@@ -3,6 +3,7 @@ README.md
 CHANGELOG.md
 docker-compose.yml
 Dockerfile
+LICENSE
 
 # Node
 ## Logs
@@ -23,3 +24,7 @@ node_modules/
 
 # VSCode
 .vscode/
+
+# markdownlint dot files
+.markdownlint.json
+.markdownlintignore

.drone.yml

@@ -15,9 +15,11 @@ steps:
       - git submodule update --init --recursive
 
   - name: "Hugo test build"
-    image: klakegg/hugo:0.91.1-ext-alpine-ci
+    image: node:lts-buster-slim
     commands:
-      - hugo --gc --minify
+      - npm install
+      - npm run test
+      - npm run build
 
 ---
 kind: pipeline
@@ -55,7 +57,7 @@ steps:
   - name: "Trivy (next)"
     image: aquasec/trivy
     commands:
-      - "trivy image ocram85/blog:next"
+      - "trivy image --exit-code 1 --no-progress ocram85/blog:next"
 
 ---
 kind: pipeline
@@ -94,7 +96,7 @@ steps:
   - name: "Trivy (latest)"
     image: aquasec/trivy
     commands:
-      - "trivy image ocram85/blog:latest"
+      - "trivy image --exit-code 1 --no-progress ocram85/blog:latest"
 
 ---
 kind: pipeline

.markdownlint.json

@@ -0,0 +1,9 @@
+{
+  "comment": "OCram85.com rules",
+  "default": true,
+  "line_length": false,
+  "no-inline-html": false,
+  "no-trailing-punctuation": false,
+  "no-duplicate-heading": false,
+  "no-bare-urls": false
+}

.markdownlintignore

@@ -0,0 +1,3 @@
+node_modules
+CHANGELOG.md
+README.md

Caddyfile

@@ -1,9 +1,7 @@
-:8088 {
+:8080 {
   root * /usr/share/caddy
   file_server
   encode gzip zstd
-  try_files {path}.html {path} /
-
   handle_errors {
         @404 {
             expression {http.error.status_code} == 404

Dockerfile

@@ -1,13 +1,15 @@
-FROM klakegg/hugo:0.91.1-ext-alpine-ci as builder
+FROM node:lts-buster-slim as builder
 COPY . /src
 #RUN ls -la
 WORKDIR /src
 #RUN ls -a
-RUN hugo --gc --minify
+RUN npm install \
+  && npm run build
 
-FROM caddy:2.4.5-alpine
+FROM caddy:2.4.6-alpine
 LABEL maintainer="marco.blessing@googlemail.com"
+COPY --from=builder /src/Caddyfile /etc/caddy/Caddyfile
 COPY --from=builder src/public /usr/share/caddy/
 HEALTHCHECK  --interval=15s --timeout=3s \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:80/ || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:8080/ || exit 1
 #RUN ls -la /usr/share/caddy/

config/_default/params.toml

@@ -6,7 +6,7 @@
 # https://jpanther.github.io/congo/docs/configuration/#theme-parameters
 
 colorScheme = "avocado"
-# darkMode = "auto"
+darkMode = "true"
 # darkToggle = false
 # logo = "img/logo.jpg"
 description = "A personal blog about PowerShell, Automation and more."

content/aboutme/index.md

@@ -13,6 +13,7 @@ showDateUpdated: true
 showReadingTime: false
 showEdit: false
 #sharingLinks: [null]
+showPagination: false
 ---
 
 {{< figure src="me.jpg" width="1200" height="800" >}}
@@ -22,7 +23,7 @@ showEdit: false
 
 ### {{< icon "terminal" >}} Projects
 
-Take a look at this [Projects]() page to get an overview of my current work.
+Take a look at this [Projects](/) page to get an overview of my current work.
 
 ### {{< icon "heart" >}} Favorite Topics
 

content/datenschutz.md

@@ -9,6 +9,7 @@ showWordCount: false
 showReadingTime: false
 showEdit: false
 sharingLinks: [null]
+showPagination: false
 ---
 
 > **Vom Websiteinhaber angepasst**
@@ -28,7 +29,7 @@ als „Onlineangebot“). Im Hinblick auf die verwendeten Begrifflichkeiten, wie
 
 ## Verantwortlicher
 
-```
+```console
 Marco Blessing
 Kapellenstraße 12
 77815 Bühl

content/impressum.md

@@ -9,11 +9,12 @@ showWordCount: false
 showReadingTime: false
 showEdit: false
 sharingLinks: [null]
+showPagination: false
 ---
 
 ## Angaben gemäß § 5 TMG:
 
-```
+```console
 Marco Blessing
 Kapellenstraße 12
 77815 Bühl

layouts/partials/extend-head.html

@@ -0,0 +1,7 @@
+<script
+  async
+  defer
+  data-website-id="3e944f0b-6377-4a23-8bdd-64b408d13611"
+  src="https://umami.ocram85.com/umami.js"
+  data-domains="ocram85.com"
+></script>

package.json

@@ -0,0 +1,35 @@
+{
+  "name": "ocram85.com-blog",
+  "version": "1.0.0",
+  "description": "A personal blog about PowerShell, Automation and more.",
+  "main": "index.js",
+  "scripts": {
+    "build": "exec-bin node_modules/.bin/hugo/hugo --gc --minify",
+    "check": "exec-bin node_modules/.bin/hugo/hugo version",
+    "clean": "rimraf public/",
+    "lint:markdown": "markdownlint \"*.md\" \"content/**/*.md\"",
+    "start": "exec-bin node_modules/.bin/hugo/hugo server --bind=0.0.0.0 --disableFastRender",
+    "server": "exec-bin node_modules/.bin/hugo/hugo server",
+    "test": "npm run lint:markdown",
+    "postinstall": "hugo-installer --version otherDependencies.hugo --extended --destination node_modules/.bin/hugo"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/OCram85/Blog.git"
+  },
+  "author": "OCram85",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/OCram85/Blog/issues"
+  },
+  "homepage": "https://github.com/OCram85/Blog#readme",
+  "devDependencies": {
+    "exec-bin": "^1.0.0",
+    "hugo-installer": "^3.1.0",
+    "markdownlint-cli": "^0.30.0",
+    "rimraf": "^3.0.2"
+  },
+  "otherDependencies": {
+    "hugo": "0.91.1"
+  }
+}