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

update Dockerfiles to remove the warnings #5035

Merged
merged 1 commit into from
Oct 19, 2024
+7 −7
Merged

update Dockerfiles to remove the warnings #5035

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/baseos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
ARG GO_VER
ARG UBUNTU_VER

FROM ubuntu:${UBUNTU_VER} as base
FROM ubuntu:${UBUNTU_VER} AS base

RUN apt update && apt install -y \
tzdata
Expand Down
6 changes: 3 additions & 3 deletions images/orderer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
###############################################################################

ARG UBUNTU_VER
FROM ubuntu:${UBUNTU_VER} as builder
FROM ubuntu:${UBUNTU_VER} AS builder

ARG TARGETARCH
ARG TARGETOS
Expand Down Expand Up @@ -57,8 +57,8 @@ 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 /etc/hyperledger/fabric
ENV FABRIC_VER ${FABRIC_VER}
ENV FABRIC_CFG_PATH=/etc/hyperledger/fabric
ENV FABRIC_VER=${FABRIC_VER}

COPY --from=builder build/bin/orderer /usr/local/bin
COPY --from=builder sampleconfig/msp ${FABRIC_CFG_PATH}/msp
Expand Down
6 changes: 3 additions & 3 deletions images/peer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
###############################################################################

ARG UBUNTU_VER
FROM ubuntu:${UBUNTU_VER} as builder
FROM ubuntu:${UBUNTU_VER} AS builder

ARG TARGETARCH
ARG TARGETOS
Expand Down Expand Up @@ -60,8 +60,8 @@ 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 /etc/hyperledger/fabric
ENV FABRIC_VER ${FABRIC_VER}
ENV FABRIC_CFG_PATH=/etc/hyperledger/fabric
ENV FABRIC_VER=${FABRIC_VER}

COPY --from=builder build/bin/peer /usr/local/bin
COPY --from=builder sampleconfig/msp ${FABRIC_CFG_PATH}/msp
Expand Down