From 1532590b5018f616b1d9a5be171d9c3f5e7e6c8c Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 26 Oct 2021 11:30:58 -0400
Subject: [PATCH] fix: ensure we pass the correct args to both derived builder
 stages

---
 contrib/build-dokku.Dockerfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/contrib/build-dokku.Dockerfile b/contrib/build-dokku.Dockerfile
index 36db254eb..2890db4fc 100644
--- a/contrib/build-dokku.Dockerfile
+++ b/contrib/build-dokku.Dockerfile
@@ -22,15 +22,15 @@ RUN make deb-setup rpm-setup sshcommand plugn
 
 COPY . ${WORKDIR}
 
+ENV GOPATH=/go
+
+FROM builder as amd64
+
 ARG PLUGIN_MAKE_TARGET
 ARG DOKKU_VERSION=master
 ARG DOKKU_GIT_REV
 ARG IS_RELEASE=false
 
-ENV GOPATH=/go
-
-FROM builder as amd64
-
 RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
   DOKKU_VERSION=${DOKKU_VERSION} \
   DOKKU_GIT_REV=${DOKKU_GIT_REV} \
@@ -39,12 +39,15 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
   make version copyfiles \
   && make deb-dokku rpm-dokku
 
-RUN ls -lha /tmp/
-
 FROM builder as armhf
 
 COPY --from=amd64 /tmp /tmp
 
+ARG PLUGIN_MAKE_TARGET
+ARG DOKKU_VERSION=master
+ARG DOKKU_GIT_REV
+ARG IS_RELEASE=false
+
 RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
   DOKKU_VERSION=${DOKKU_VERSION} \
   DOKKU_GIT_REV=${DOKKU_GIT_REV} \