fix: ensure we pass the correct args to both derived builder stages
This commit is contained in:
1 parent
d3cbb730ac
commit
1532590b50
1 file changed
+9
-6
@@ -22,15 +22,15 @@ RUN make deb-setup rpm-setup sshcommand plugn
|
|||||||
|
|
||||||
COPY . ${WORKDIR}
|
COPY . ${WORKDIR}
|
||||||
|
|
||||||
|
ENV GOPATH=/go
|
||||||
|
|
||||||
|
FROM builder as amd64
|
||||||
|
|
||||||
ARG PLUGIN_MAKE_TARGET
|
ARG PLUGIN_MAKE_TARGET
|
||||||
ARG DOKKU_VERSION=master
|
ARG DOKKU_VERSION=master
|
||||||
ARG DOKKU_GIT_REV
|
ARG DOKKU_GIT_REV
|
||||||
ARG IS_RELEASE=false
|
ARG IS_RELEASE=false
|
||||||
|
|
||||||
ENV GOPATH=/go
|
|
||||||
|
|
||||||
FROM builder as amd64
|
|
||||||
|
|
||||||
RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
|
RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
|
||||||
DOKKU_VERSION=${DOKKU_VERSION} \
|
DOKKU_VERSION=${DOKKU_VERSION} \
|
||||||
DOKKU_GIT_REV=${DOKKU_GIT_REV} \
|
DOKKU_GIT_REV=${DOKKU_GIT_REV} \
|
||||||
@@ -39,12 +39,15 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
|
|||||||
make version copyfiles \
|
make version copyfiles \
|
||||||
&& make deb-dokku rpm-dokku
|
&& make deb-dokku rpm-dokku
|
||||||
|
|
||||||
RUN ls -lha /tmp/
|
|
||||||
|
|
||||||
FROM builder as armhf
|
FROM builder as armhf
|
||||||
|
|
||||||
COPY --from=amd64 /tmp /tmp
|
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} \
|
RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
|
||||||
DOKKU_VERSION=${DOKKU_VERSION} \
|
DOKKU_VERSION=${DOKKU_VERSION} \
|
||||||
DOKKU_GIT_REV=${DOKKU_GIT_REV} \
|
DOKKU_GIT_REV=${DOKKU_GIT_REV} \
|
||||||
|
|||||||
Reference in new issue
Block a user