From ae14b02cbdb3fffd1a823abbbd805d957537f7c6 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 27 Oct 2021 12:07:35 -0400 Subject: [PATCH] fix: pull manpage from amd64 stage --- Makefile | 4 ++++ contrib/build-dokku.Dockerfile | 1 + 2 files changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 720702438..a6e9b3972 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,11 @@ endif addman: help2man man-db mkdir -p /usr/local/share/man/man1 +ifneq ("$(wildcard /usr/local/share/man/man1/dokku.1-generated)","") + cp /usr/local/share/man/man1/dokku.1-generated /usr/local/share/man/man1/dokku.1 +else help2man -Nh help -v version -n "configure and get information from your dokku installation" -o /usr/local/share/man/man1/dokku.1 dokku +endif mandb version: diff --git a/contrib/build-dokku.Dockerfile b/contrib/build-dokku.Dockerfile index 2890db4fc..83973b119 100644 --- a/contrib/build-dokku.Dockerfile +++ b/contrib/build-dokku.Dockerfile @@ -42,6 +42,7 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \ FROM builder as armhf COPY --from=amd64 /tmp /tmp +COPY --from=amd64 /usr/local/share/man/man1/dokku.1 /usr/local/share/man/man1/dokku.1-generated ARG PLUGIN_MAKE_TARGET ARG DOKKU_VERSION=master