Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Revert image FABRIC_CFG_PATH to /etc/hyperledger/fabric (release-2.5) #4575

Merged
merged 1 commit into from
Dec 25, 2023
Merged

Revert image FABRIC_CFG_PATH to /etc/hyperledger/fabric (release-2.5) #4575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion images/orderer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ARG FABRIC_VER
# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
RUN echo 'hosts: files dns' > /etc/nsswitch.conf

ENV FABRIC_CFG_PATH /var/hyperledger/fabric/config
ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
ENV FABRIC_VER ${FABRIC_VER}

COPY --from=builder build/bin/orderer /usr/local/bin
Expand Down
2 changes: 1 addition & 1 deletion images/peer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ARG FABRIC_VER
# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
RUN echo 'hosts: files dns' > /etc/nsswitch.conf

ENV FABRIC_CFG_PATH /var/hyperledger/fabric/config
ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
ENV FABRIC_VER ${FABRIC_VER}

COPY --from=builder build/bin/peer /usr/local/bin
Expand Down
2 changes: 1 addition & 1 deletion images/tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ ENV PATH="/usr/local/go/bin:$PATH"
# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
RUN echo 'hosts: files dns' > /etc/nsswitch.conf

ENV FABRIC_CFG_PATH /var/hyperledger/fabric/config
ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
ENV FABRIC_VER ${FABRIC_VER}

COPY --from=builder sampleconfig ${FABRIC_CFG_PATH}
Expand Down