Skip to content

Commit ba31954

Browse files
sykesmsykesm
committed
Revert cross-compile changes for docker imaages
The cross-compiled binaries are not compatible with the musl based images we produce. FAB-16632 #done Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com> Change-Id: I1a812e1ae1b46dcf9bc9dba055e2b2231b22741d
1 parent 6a8503a commit ba31954

File tree

7 files changed

+76
-34
lines changed

7 files changed

+76
-34
lines changed

‎Makefile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,10 @@ GO_TAGS ?=
8686

8787
# No sense rebuilding when non production code is changed
8888
PROJECT_FILES = $(shell git ls-files | grep -Ev '^integration/|^vagrant/|.png$|^LICENSE|^vendor/')
89-
IMAGES = baseos buildenv ccenv orderer peer tools
90-
RELEASE_IMAGES = baseos ccenv orderer peer tools
91-
RELEASE_PKGS = orderer $(TOOLS_PKGS)
9289
RELEASE_PLATFORMS = darwin-amd64 linux-amd64 linux-ppc64le linux-s390x windows-amd64
93-
TOOLS_PKGS = configtxgen configtxlator cryptogen discover idemixgen peer
90+
RELEASE_PKGS = configtxgen cryptogen idemixgen discover configtxlator peer orderer
91+
RELEASE_IMAGES = baseos ccenv orderer peer tools
92+
IMAGES = buildenv $(RELEASE_IMAGES)
9493

9594
pkgmap.configtxgen := $(PKGNAME)/cmd/configtxgen
9695
pkgmap.configtxlator := $(PKGNAME)/cmd/configtxlator
@@ -233,11 +232,9 @@ $(BUILD_DIR)/bin/%: $(PROJECT_FILES)
233232
@echo "Binary available as $@"
234233
@touch $@
235234

236-
$(BUILD_DIR)/images/tools/$(DUMMY): $(patsubst %,release/linux-amd64/bin/%, $(TOOLS_PKGS))
237-
238-
$(BUILD_DIR)/images/peer/$(DUMMY): release/linux-amd64/bin/peer
235+
$(BUILD_DIR)/images/peer/$(DUMMY): BUILD_ARGS=--build-arg GO_TAGS=${GO_TAGS}
239236

240-
$(BUILD_DIR)/images/orderer/$(DUMMY): release/linux-amd64/bin/orderer
237+
$(BUILD_DIR)/images/orderer/$(DUMMY): BUILD_ARGS=--build-arg GO_TAGS=${GO_TAGS}
241238

242239
$(BUILD_DIR)/images/%/$(DUMMY):
243240
@mkdir -p $(@D)
@@ -246,6 +243,7 @@ $(BUILD_DIR)/images/%/$(DUMMY):
246243
$(DBUILD) -f images/$(TARGET)/Dockerfile \
247244
--build-arg GO_VER=${GO_VER} \
248245
--build-arg ALPINE_VER=${ALPINE_VER} \
246+
${BUILD_ARGS} \
249247
-t $(DOCKER_NS)/fabric-$(TARGET) .
250248
docker tag $(DOCKER_NS)/fabric-$(TARGET) $(DOCKER_NS)/fabric-$(TARGET):$(BASE_VERSION)
251249
docker tag $(DOCKER_NS)/fabric-$(TARGET) $(DOCKER_NS)/fabric-$(TARGET):$(DOCKER_TAG)

‎images/baseos/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5+
ARG GO_VER
56
ARG ALPINE_VER
67

7-
FROM alpine:${ALPINE_VER}
8+
FROM alpine:${ALPINE_VER} as base
89
RUN apk add --no-cache tzdata
910
RUN addgroup -g 500 chaincode && adduser -u 500 -D -h /home/chaincode -G chaincode chaincode
1011
USER chaincode

‎images/buildenv/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
ARG ALPINE_VER
65
ARG GO_VER
7-
6+
ARG ALPINE_VER
87
FROM golang:${GO_VER}-alpine${ALPINE_VER} as golang
98
RUN apk add --no-cache \
109
gcc \

‎images/ccenv/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
ARG ALPINE_VER
65
ARG GO_VER
7-
6+
ARG ALPINE_VER
87
FROM golang:${GO_VER}-alpine${ALPINE_VER}
98
RUN apk add --no-cache \
109
g++ \

‎images/orderer/Dockerfile

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,32 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5+
ARG GO_VER
56
ARG ALPINE_VER
6-
7-
FROM alpine:${ALPINE_VER}
7+
FROM alpine:${ALPINE_VER} as base
88
RUN apk add --no-cache tzdata
9+
10+
FROM golang:${GO_VER}-alpine${ALPINE_VER} as golang
11+
RUN apk add --no-cache \
12+
gcc \
13+
musl-dev \
14+
git \
15+
bash \
16+
make;
17+
ADD . $GOPATH/src/github.com/hyperledger/fabric
18+
WORKDIR $GOPATH/src/github.com/hyperledger/fabric
19+
20+
FROM golang as orderer
21+
ARG GO_TAGS
22+
RUN make orderer GO_TAGS=${GO_TAGS}
23+
24+
FROM base
925
ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
1026
VOLUME /etc/hyperledger/fabric
1127
VOLUME /var/hyperledger
12-
COPY --chown=0:0 release/linux-amd64/bin/orderer /usr/local/bin
13-
COPY --chown=0:0 sampleconfig/msp ${FABRIC_CFG_PATH}/msp
14-
COPY --chown=0:0 sampleconfig/orderer.yaml ${FABRIC_CFG_PATH}
15-
COPY --chown=0:0 sampleconfig/configtx.yaml ${FABRIC_CFG_PATH}
28+
COPY --from=orderer /go/src/github.com/hyperledger/fabric/.build/bin /usr/local/bin
29+
COPY --from=orderer /go/src/github.com/hyperledger/fabric/sampleconfig/msp ${FABRIC_CFG_PATH}/msp
30+
COPY --from=orderer /go/src/github.com/hyperledger/fabric/sampleconfig/orderer.yaml ${FABRIC_CFG_PATH}
31+
COPY --from=orderer /go/src/github.com/hyperledger/fabric/sampleconfig/configtx.yaml ${FABRIC_CFG_PATH}
1632
EXPOSE 7050
1733
CMD ["orderer"]

‎images/peer/Dockerfile

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,32 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5+
ARG GO_VER
56
ARG ALPINE_VER
67

7-
FROM alpine:${ALPINE_VER}
8+
FROM alpine:${ALPINE_VER} as peer-base
89
RUN apk add --no-cache tzdata
10+
11+
FROM golang:${GO_VER}-alpine${ALPINE_VER} as golang
12+
RUN apk add --no-cache \
13+
bash \
14+
gcc \
15+
git \
16+
make \
17+
musl-dev
18+
ADD . $GOPATH/src/github.com/hyperledger/fabric
19+
WORKDIR $GOPATH/src/github.com/hyperledger/fabric
20+
21+
FROM golang as peer
22+
ARG GO_TAGS
23+
RUN make peer GO_TAGS=${GO_TAGS}
24+
25+
FROM peer-base
926
ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
1027
VOLUME /etc/hyperledger/fabric
1128
VOLUME /var/hyperledger
12-
COPY --chown=0:0 release/linux-amd64/bin/peer /usr/local/bin
13-
COPY --chown=0:0 sampleconfig/msp ${FABRIC_CFG_PATH}/msp
14-
COPY --chown=0:0 sampleconfig/core.yaml ${FABRIC_CFG_PATH}
29+
COPY --from=peer /go/src/github.com/hyperledger/fabric/.build/bin /usr/local/bin
30+
COPY --from=peer /go/src/github.com/hyperledger/fabric/sampleconfig/msp ${FABRIC_CFG_PATH}/msp
31+
COPY --from=peer /go/src/github.com/hyperledger/fabric/sampleconfig/core.yaml ${FABRIC_CFG_PATH}
1532
EXPOSE 7051
1633
CMD ["peer","node","start"]

‎images/tools/Dockerfile

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,29 @@
44

55
ARG GO_VER
66
ARG ALPINE_VER
7+
FROM golang:${GO_VER}-alpine as golang
78

8-
FROM golang:${GO_VER}-alpine${ALPINE_VER}
9-
RUN apk add --no-cache bash git jq tzdata
9+
RUN apk add --no-cache \
10+
bash \
11+
gcc \
12+
git \
13+
make \
14+
musl-dev;
15+
16+
ADD . $GOPATH/src/github.com/hyperledger/fabric
17+
WORKDIR $GOPATH/src/github.com/hyperledger/fabric
18+
19+
FROM golang as tools
20+
RUN make configtxgen configtxlator cryptogen peer discover idemixgen
21+
22+
FROM golang:${GO_VER}-alpine
23+
# git is required to support `go list -m`
24+
RUN apk add --no-cache \
25+
bash \
26+
git \
27+
jq \
28+
tzdata;
1029
ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
1130
VOLUME /etc/hyperledger/fabric
12-
COPY --chown=0:0 sampleconfig ${FABRIC_CFG_PATH}
13-
COPY --chown=0:0 \
14-
release/linux-amd64/bin/configtxgen \
15-
release/linux-amd64/bin/configtxlator \
16-
release/linux-amd64/bin/cryptogen \
17-
release/linux-amd64/bin/discover \
18-
release/linux-amd64/bin/idemixgen \
19-
release/linux-amd64/bin/peer \
20-
/usr/local/bin/
31+
COPY --from=tools /go/src/github.com/hyperledger/fabric/.build/bin /usr/local/bin
32+
COPY --from=tools /go/src/github.com/hyperledger/fabric/sampleconfig ${FABRIC_CFG_PATH}

0 commit comments

Comments
 (0)