Преглед на файлове

Make manpages in a conatiner.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 7004f219f5d0fe99de0dadf319381d224866eb7c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Daniel Nephin преди 9 години
родител
ревизия
c5531b033a
променени са 3 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      hack/make/build-deb
  2. 1 1
      hack/make/build-rpm
  3. 1 1
      hack/make/ubuntu

+ 1 - 1
hack/make/build-deb

@@ -35,7 +35,7 @@ set -e
 	debDate="$(date --rfc-2822)"
 
 	# if go-md2man is available, pre-generate the man pages
-	./man/generate.sh || true
+	make manpages || true
 	# TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this
 
 	builderDir="contrib/builder/deb/${PACKAGE_ARCH}"

+ 1 - 1
hack/make/build-rpm

@@ -51,7 +51,7 @@ set -e
 	rpmDate="$(date +'%a %b %d %Y')"
 
 	# if go-md2man is available, pre-generate the man pages
-	./man/generate.sh || true
+	make manpages || true
 	# TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this
 
 	# Convert the CHANGELOG.md file into RPM changelog format

+ 1 - 1
hack/make/ubuntu

@@ -60,7 +60,7 @@ bundle_ubuntu() {
 	cp contrib/completion/fish/docker.fish "$DIR/etc/fish/completions/"
 
 	# Include man pages
-	man/generate.sh
+	make manpages
 	manRoot="$DIR/usr/share/man"
 	mkdir -p "$manRoot"
 	for manDir in man/man?; do