Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit 3c6b659

Browse files
committed
Fixed generation of manpages for runc
1 parent ebde9e9 commit 3c6b659

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

tools/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ debug-%: base %/manifest.json %/Dockerfile ; $(info $(M) Debugging image for $*.
8080
--cache-from $(REGISTRY)/$(OWNER)/$(PROJECT)/$*:$(GIT_BRANCH) \
8181
--tag $(REGISTRY)/$(OWNER)/$(PROJECT)/$*:$(GIT_BRANCH) \
8282
--target prepare \
83-
--load && \
83+
--load \
84+
--progress plain \
85+
--no-cache && \
8486
docker container run \
8587
--interactive \
8688
--tty \

tools/runc/Dockerfile.template

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
#syntax=docker/dockerfile:1.4.2
22

33
ARG ref=main
4+
FROM ghcr.io/nicholasdille/docker-setup/go-md2man:${ref} AS go-md2man
45
FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
56

67
ARG name=runc
78
ARG version=1.1.3
89

10+
COPY --from=go-md2man / /
11+
912
RUN <<EOF
1013
curl -sLo "${prefix}${target}/bin/runc" \
1114
"https://github.com/opencontainers/runc/releases/download/v${version}/runc.${alt_arch}"
@@ -46,8 +49,8 @@ curl -sLo "${prefix}${target}/share/man/man8/runc-update.8.md" \
4649
"https://github.com/opencontainers/runc/raw/v${version}/man/runc-update.8.md"
4750
curl -sLo "${prefix}${target}/share/man/man8/runc.8.md" \
4851
"https://github.com/opencontainers/runc/raw/v${version}/man/runc.8.md"
49-
find "${target}/share/man/man8" -type f -name \*.md \
50-
| while read FILE; do
52+
MANPAGES="$(find "${prefix}${target}/share/man/man8" -type f -name \*.md)"
53+
for FILE in ${MANPAGES}; do
5154
DEST_FILE="$(basename "${FILE}" .md)"
5255
DEST_DIR="$(dirname "${FILE}")"
5356
DEST="${DEST_DIR}/${DEST_FILE}"

0 commit comments

Comments
 (0)