Compare commits

...

2 commits

Author SHA1 Message Date
cfafb01f85 适配woodpecker ci更新
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-03-06 20:48:04 +08:00
9f63c673d0 升级版本:nodejs 22+pandoc 3.6.3 2025-03-06 20:46:41 +08:00
2 changed files with 16 additions and 8 deletions

View file

@ -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

View file

@ -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