Skip to content

Commit

Permalink
Revert image FABRIC_CFG_PATH to /etc/hyperledger/fabric (#4574)
Browse files Browse the repository at this point in the history
The updated image for v2.5 release set FABRIC_CFG_PATH to /var/hyperledger/fabric/config.

Historically the value has been /etc/hyperledger/fabric, and it is more typical for configs to exist in /etc than /var.

Additionally the code defaults to /etc/hyperledger/fabric and the docs still mention /etc/hyperledger/fabric,
therefore this commit sets it back to /etc/hyperledger/fabric.

Ultimately, it shouldn't really matter since the core.yaml and orderer.yaml are copied to FABRIC_CFG_PATH,
and the executables reference the configs using FABRIC_CFG_PATH. So the change is a noop at runtime,
but better to get the image back to consistency with the code, docs, and historical precedents.

Signed-off-by: David Enyeart <enyeart@davids-mbp.raleigh.ibm.com>
Co-authored-by: David Enyeart <enyeart@davids-mbp.raleigh.ibm.com>
  • Loading branch information
denyeart and David Enyeart authored Dec 13, 2023
1 parent 6264678 commit 7e2d9f8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion images/orderer/Dockerfile
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
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
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

0 comments on commit 7e2d9f8

Please sign in to comment.