-
Notifications
You must be signed in to change notification settings - Fork 8.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Updated dockerfile with new build arg #3338
Conversation
images/peer/Dockerfile
Outdated
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/bin/ccaas_builder/bin/ /opt/hyperledger/ccaas_builder/bin/ | ||
COPY --from=peer /go/src/github.com/hyperledger/fabric/release/${MARCH}/bin/ccaas_builder/bin/ /opt/hyperledger/ccaas_builder/bin/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not think that will work since line 29 is running inside the staged docker image, and $MARCH will point to host architecture rather than the correct one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree, It should be set to stage docker image specific os-arch. i think, the value should be read from the previous stage where ccaasbuilder is compiled.
Signed-off-by: Parameswaran Selvam <parselva@in.ibm.com>
@mbwhite Can you help with this one? |
I think that maybe this would be superseded by #3315 |
The problem here is that #3315 doesn't really help for M1 and arm64-based architecture, because currently, the copy path is hardcoded into Dockerfile:
So on M1 and arm64, the folder would be |
Type of change
Description
Updated multistage peer dockerfile with ccbuilder binaries location. It becomes 2 step process to copy the binaries Step 1. copy the files into temporary location, Step 2. copy the files into correction location into docker image
Related issues
#3337
Signed-off-by: Parameswaran Selvam parselva@in.ibm.com