adds Mastodon profile

.woodpecker/ci.yml

@@ -1,70 +0,0 @@
-when:
-  - event: [pull_request, tag, cron]
-  - event: push
-    branch:
-      - ${CI_REPO_DEFAULT_BRANCH}
-
-variables:
-  - &build_plugin 'woodpeckerci/plugin-docker-buildx:3.2.1'
-  # deployment targets
-  - &publish_repos 'ocram85/blog,gitea.ocram85.com/ocram85/blog'
-  # logins for deployment targets
-  - publish_logins: &publish_logins
-    # Default DockerHub login
-    - registry: https://index.docker.io/v1/
-      username:
-        from_secret: hub_user
-      password:
-        from_secret: hub_passwd
-    # Additional Quay.IO login
-    - registry: https://gitea.ocram85.com
-      username:
-        from_secret: gitea_user
-      password:
-        from_secret: gitea_passwd
-
-steps:
-  test:
-    image: *build_plugin
-    settings:
-      dry_run: true
-      registry: gitea.ocram85.com
-      repo: test
-      dockerfile: Dockerfile
-      platforms: linux/amd64
-      auto_tag: true
-      #build_args:
-      #  - VERSION=${CI_COMMIT_TAG:-PR ${CI_COMMIT_PULL_REQUEST}}
-      #  - TAG=${CI_COMMIT_TAG}
-    when:
-      event: pull_request
-      branch: ${CI_REPO_DEFAULT_BRANCH}
-
-  publish:
-    image: *build_plugin
-    settings:
-      repo: *publish_repos
-      dockerfile: Dockerfile
-      platforms: linux/amd64
-      auto_tag: true
-      logins: *publish_logins
-      #build_args:
-      #  - VERSION=${CI_COMMIT_TAG:-PR ${CI_COMMIT_PULL_REQUEST}}
-      #  - TAG=${CI_COMMIT_TAG}
-    when:
-      event: [push, tag, cron]
-      branch: ${CI_REPO_DEFAULT_BRANCH}
-
-  build-next:
-    image: *build_plugin
-    settings:
-      repo: *publish_repos
-      dockerfile: Dockerfile
-      platforms: linux/amd64
-      tag: next
-      logins: *publish_logins
-      #build_args:
-      #  - VERSION=${CI_COMMIT_TAG:-PR ${CI_COMMIT_PULL_REQUEST}}
-      #  - TAG=${CI_COMMIT_TAG}
-    when:
-      event: [pull_request]

.woodpecker/master.yml

@@ -0,0 +1,66 @@
+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
+
+  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.36.1
+    commands:
+      - |
+        trivy image \
+          --severity UNKNOWN,LOW,MEDIUM \
+          --no-progress \
+          ocram85/blog:latest
+      - |
+        trivy image \
+          --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

.woodpecker/next.yml

@@ -0,0 +1,56 @@
+depends_on:
+  - test
+
+pipeline:
+  buildNext:
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: ocram85/blog
+      dockerfile: Dockerfile
+      tags: next
+      username:
+        from_secret: hub_user
+      password:
+        from_secret: hub_passwd
+    when:
+      event: pull_request
+
+  buildNextGitea:
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      registry: gitea.ocram85.com
+      repo: gitea.ocram85.com/ocram85/blog
+      dockerfile: Dockerfile
+      tags: next
+      username:
+        from_secret: gitea_user
+      password:
+        from_secret: gitea_passwd
+    when:
+      event: pull_request
+
+  trivyNext:
+    image: aquasec/trivy:0.36.1
+    commands:
+      - |
+        trivy image \
+          --severity UNKNOWN,LOW,MEDIUM \
+          --no-progress \
+          ocram85/blog:next
+      - |
+        trivy image \
+          --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

.woodpecker/renovate.yml

@@ -0,0 +1,22 @@
+pipeline:
+  DockerBaseImage:
+    image: renovate/renovate:34.108-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

.woodpecker/test.yml

@@ -0,0 +1,7 @@
+pipeline:
+  build:
+    image: node:lts-buster-slim
+    commands:
+      - npm install
+      - npm run test
+      - npm run build

Dockerfile

@@ -8,7 +8,7 @@ RUN npm install \
 
 FROM nginx:1.23.3-alpine as prod
 LABEL maintainer="marco.blessing@googlemail.com"
-#HEALTHCHECK  --interval=15s --timeout=5s \
+HEALTHCHECK  --interval=15s --timeout=5s \
-#  CMD wget --no-verbose --tries=1 --spider http://localhost:80/ || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:80/ || exit 1
 COPY --from=builder src/public /usr/share/nignx/html/
 COPY nginx.conf /etc/nginx/nginx.conf

README.md

@@ -43,4 +43,4 @@ The next tag is used for testing any code changes on development branches and pu
 
 This image contains the hugo based sources for my personal blog. It's made with the [Congo theme](https://github.com/jpanther/congo). The static pages are served by the included nginx server with a custom config. The custom config is needed to redirect 404 errors to a custom page.
 
-You can simply run the container with `docker run -it --rm -p "8080:80" ocram85/blog:latest`.
+You can simply run the container with `docker run -it --rm -p "8080:80" ocram85/blog:latest`

config/_default/languages.en.toml

@@ -38,7 +38,7 @@ dateFormat = "2 January 2006"
   #   { kickstarter = "https://www.kickstarter.com/profile/username" },
   #   { lastfm = "https://lastfm.com/user/username" },
     { linkedin = "https://linkedin.com/in/marco-blessing-884642109" },
-  #   { mastodon = "https://mastodon.instance/@username" },
+    { mastodon = "https://social.anoxinon.de/@OCram85" },
   #   { medium = "https://medium.com/username" },
   #   { microsoft = "https://www.microsoft.com/" },
   #   { patreon = "https://www.patreon.com/username" },

layouts/partials/extend-head.html

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

nginx.conf

@@ -5,7 +5,7 @@ http {
   include mime.types;
 
   server {
-    listen 0.0.0.0:80;
+    listen 80;
     root /usr/share/nignx/html;
     index index.html;
     error_page 404 /404.html;