From c4c7289c3b5de190df4f4101e0475dbb6690d7f4 Mon Sep 17 00:00:00 2001 From: Josh Kneubuhl Date: Tue, 6 Dec 2022 16:25:26 -0500 Subject: [PATCH] fix the multi-arch Docker peer build Signed-off-by: Josh Kneubuhl --- images/peer/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/peer/Dockerfile b/images/peer/Dockerfile index aa4bfc680d2..0f7abbd94aa 100644 --- a/images/peer/Dockerfile +++ b/images/peer/Dockerfile @@ -29,12 +29,14 @@ RUN make peer GO_TAGS=${GO_TAGS} RUN make ccaasbuilder FROM peer-base +ARG TARGETARCH +ARG TARGETOS ENV FABRIC_CFG_PATH /etc/hyperledger/fabric VOLUME /etc/hyperledger/fabric VOLUME /var/hyperledger COPY --from=peer /go/src/github.com/hyperledger/fabric/build/bin /usr/local/bin COPY --from=peer /go/src/github.com/hyperledger/fabric/sampleconfig/msp ${FABRIC_CFG_PATH}/msp COPY --from=peer /go/src/github.com/hyperledger/fabric/sampleconfig/core.yaml ${FABRIC_CFG_PATH}/core.yaml -COPY --from=peer /go/src/github.com/hyperledger/fabric/release/linux-amd64/builders/ccaas/bin/ /opt/hyperledger/ccaas_builder/bin/ +COPY --from=peer /go/src/github.com/hyperledger/fabric/release/${TARGETOS}-${TARGETARCH}/builders/ccaas/bin/ /opt/hyperledger/ccaas_builder/bin/ EXPOSE 7051 CMD ["peer","node","start"]