From cc3caa58b6d5c43602a5d927d4b940bf72be34a0 Mon Sep 17 00:00:00 2001
From: vrifox <vrifox@vrifox.cc>
Date: Tue, 16 May 2023 20:23:43 +0200
Subject: [PATCH 1/3] use settings block

---
 .woodpecker.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 86a1e13..7dbaed8 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,13 +1,13 @@
 pipeline:
   build-and-push:
     image: plugins/docker
-    registry: code.cozy.town
-    username: ${REGISTRY_USERNAME}
-    password: ${REGISTRY_TOKEN}
-    repo: code.cozy.town/vrifox/hugoci
-    tags: 
-      - latest
-    cache_from: code.cozy.town/vrifox/hugoci:latest
-    secrets: 
-      - registry_username
-      - registry_token
\ No newline at end of file
+    settings:
+      registry: code.cozy.town
+      username: 
+        from_secret: registry_username
+      password: 
+        from_secret: registry_token
+      repo: code.cozy.town/vrifox/hugoci
+      tags: 
+        - latest
+      cache_from: code.cozy.town/vrifox/hugoci:latest
\ No newline at end of file

From eaf380bfdce3c744333d18d3ae03dae01387948e Mon Sep 17 00:00:00 2001
From: vrifox <vrifox@vrifox.cc>
Date: Fri, 16 Feb 2024 20:40:20 +0100
Subject: [PATCH 2/3] add pnpm

---
 .woodpecker.yml | 10 +++++-----
 Dockerfile      |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7dbaed8..f4da37d 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,13 +1,13 @@
-pipeline:
+steps:
   build-and-push:
     image: plugins/docker
     settings:
       registry: code.cozy.town
-      username: 
+      username:
         from_secret: registry_username
-      password: 
+      password:
         from_secret: registry_token
       repo: code.cozy.town/vrifox/hugoci
-      tags: 
+      tags:
         - latest
-      cache_from: code.cozy.town/vrifox/hugoci:latest
\ No newline at end of file
+      cache_from: code.cozy.town/vrifox/hugoci:latest
diff --git a/Dockerfile b/Dockerfile
index 5c82374..29a213e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,5 @@
 FROM docker.io/alpine:latest
-RUN apk add --no-cache hugo git openssh rsync
\ No newline at end of file
+RUN apk add --no-cache hugo git openssh rsync curl nodejs
+RUN curl -L https://unpkg.com/@pnpm/self-installer | node
+RUN hugo version
+RUN pnpm --version

From 640511705b207d8d0a1503aa876cfcfcc830780e Mon Sep 17 00:00:00 2001
From: vrifox <vrifox@vrifox.cc>
Date: Fri, 16 Feb 2024 21:43:36 +0100
Subject: [PATCH 3/3] [ci] use npm instead of pnpm

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 29a213e..aa1b27e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 FROM docker.io/alpine:latest
-RUN apk add --no-cache hugo git openssh rsync curl nodejs
-RUN curl -L https://unpkg.com/@pnpm/self-installer | node
+RUN apk add --no-cache hugo git openssh rsync npm
 RUN hugo version
-RUN pnpm --version
+RUN npm --version