From defcad2bcd04b4b8427b2ca8ae76e44699ccd7a5 Mon Sep 17 00:00:00 2001 From: Justin Thompson <37157877+J-Thompson12@users.noreply.github.com> Date: Mon, 10 Aug 2020 14:10:33 -0600 Subject: [PATCH] fix docker build (#437) * fix docker build * docs Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com> --- Dockerfile | 3 ++- Makefile | 10 +++++----- docs/quickstart/installation.md | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d28298df..60715639 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ WORKDIR /go/src/github.com/Chainsafe/ethermint # Install dependencies RUN apk add --update $PACKAGES +RUN apk add linux-headers # Add source files COPY . . @@ -22,7 +23,7 @@ FROM alpine RUN apk add --update ca-certificates WORKDIR /root -# Copy over binaries from the build-env +# Copy over binaries from the build-env COPY --from=build-env /go/src/github.com/Chainsafe/ethermint/build/ethermintd /usr/bin/ethermintd COPY --from=build-env /go/src/github.com/Chainsafe/ethermint/build/ethermintcli /usr/bin/ethermintcli diff --git a/Makefile b/Makefile index 7c003393..2250cf0a 100644 --- a/Makefile +++ b/Makefile @@ -104,11 +104,11 @@ all: tools verify install build: go.sum ifeq ($(OS), Windows_NT) - go build -mod=readonly $(BUILD_FLAGS) -o build/$(DETECTED_OS)/$(ETHERMINT_DAEMON_BINARY).exe ./cmd/$(ETHERMINT_DAEMON_BINARY) - go build -mod=readonly $(BUILD_FLAGS) -o build/$(DETECTED_OS)/$(ETHERMINT_CLI_BINARY).exe ./cmd/$(ETHERMINT_CLI_BINARY) + go build -mod=readonly $(BUILD_FLAGS) -o build/$(ETHERMINT_DAEMON_BINARY).exe ./cmd/$(ETHERMINT_DAEMON_BINARY) + go build -mod=readonly $(BUILD_FLAGS) -o build/$(ETHERMINT_CLI_BINARY).exe ./cmd/$(ETHERMINT_CLI_BINARY) else - go build -mod=readonly $(BUILD_FLAGS) -o build/$(DETECTED_OS)/$(ETHERMINT_DAEMON_BINARY) ./cmd/$(ETHERMINT_DAEMON_BINARY) - go build -mod=readonly $(BUILD_FLAGS) -o build/$(DETECTED_OS)/$(ETHERMINT_CLI_BINARY) ./cmd/$(ETHERMINT_CLI_BINARY) + go build -mod=readonly $(BUILD_FLAGS) -o build/$(ETHERMINT_DAEMON_BINARY) ./cmd/$(ETHERMINT_DAEMON_BINARY) + go build -mod=readonly $(BUILD_FLAGS) -o build/$(ETHERMINT_CLI_BINARY) ./cmd/$(ETHERMINT_CLI_BINARY) endif go build -mod=readonly ./... @@ -129,7 +129,7 @@ install: clean: @rm -rf ./build ./vendor -docker: +docker-build: docker build -t ${DOCKER_IMAGE}:${DOCKER_TAG} . docker tag ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:latest docker tag ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:${COMMIT_HASH} diff --git a/docs/quickstart/installation.md b/docs/quickstart/installation.md index 983df7d7..7312386e 100644 --- a/docs/quickstart/installation.md +++ b/docs/quickstart/installation.md @@ -26,7 +26,7 @@ ethermintcli -h You can build Ethermint using Docker by running: ```bash -make docker +make docker-build ``` This will install the binaries on the `./build` directory. Now, check that the binaries have been