.woodpecker.yml

@@ -3,13 +3,11 @@ 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
-    environment:
-      REGISTRY_USERNAME:
-        from_secret: registry_username
-      REGISTRY_PASSWORD:
-        from_secret: registry_password
+    secrets:
+      - registry_username
+      - registry_password

Dockerfile

@@ -8,17 +8,11 @@ RUN dnf install \
     --releasever 9 \
     --setopt install_weak_deps=false \
     --nodocs -y \
-    git-tools \
-    && dnf module install \
-    --installroot /fakeroot \
-    --releasever 9 \
-    --setopt install_weak_deps=false \
-    --nodocs -y \
-    nodejs:22 \
+    nodejs npm git-tools \
     && dnf clean all --installroot /fakeroot
-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
+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
 
 
 FROM scratch