From 9f63c673d0c31ea3fdc5e0020ace4f7245b37c17 Mon Sep 17 00:00:00 2001
From: zhbaor <zhbaor@zhaozuohong.vip>
Date: Thu, 6 Mar 2025 20:46:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=9Anodejs=2022+pandoc=203.6.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3544f24..c1a57d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,11 +8,17 @@ RUN dnf install \
     --releasever 9 \
     --setopt install_weak_deps=false \
     --nodocs -y \
-    nodejs npm git-tools \
+    git-tools \
+    && dnf module install \
+    --installroot /fakeroot \
+    --releasever 9 \
+    --setopt install_weak_deps=false \
+    --nodocs -y \
+    nodejs:22 \
     && dnf clean all --installroot /fakeroot
-RUN curl -L -o pandoc-3.1.9.tar.gz https://github.com/jgm/pandoc/releases/download/3.1.9/pandoc-3.1.9-linux-amd64.tar.gz \
-    && tar -xvf pandoc-3.1.9.tar.gz \
-    && cp pandoc-3.1.9/bin/pandoc /fakeroot/usr/local/bin/pandoc
+RUN curl -L -o pandoc.tar.gz https://github.com/jgm/pandoc/releases/download/3.6.3/pandoc-3.6.3-linux-amd64.tar.gz \
+    && tar -xvf pandoc.tar.gz \
+    && cp pandoc*/bin/pandoc /fakeroot/usr/local/bin/pandoc
 
 
 FROM scratch

From cfafb01f854186bc38d709ef41a19eed0a2ce98a Mon Sep 17 00:00:00 2001
From: zhbaor <zhbaor@zhaozuohong.vip>
Date: Thu, 6 Mar 2025 20:48:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8Dwoodpecker=20ci=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 213776e..4a63bf8 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,11 +3,13 @@ steps:
     image: git.zhaozuohong.vip/zhao/docker-docker
     commands:
       - docker build . --rm -t git.zhaozuohong.vip/zhao/node-pandoc
-      - docker login -u $REGISTRY_USERNAME -p $REGISTRY_PASSWORD git.zhaozuohong.vip
+      - docker login -u $${REGISTRY_USERNAME} -p $${REGISTRY_PASSWORD} git.zhaozuohong.vip
       - docker push git.zhaozuohong.vip/zhao/node-pandoc
       - docker rmi git.zhaozuohong.vip/zhao/node-pandoc
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-    secrets:
-      - registry_username
-      - registry_password
+    environment:
+      REGISTRY_USERNAME:
+        from_secret: registry_username
+      REGISTRY_PASSWORD:
+        from_secret: registry_password