build: fix docker-build command (#116)

* build: fix docker-build command

* Update docs/quickstart/installation.md

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

CHANGELOG.md

@@ -41,6 +41,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 * (ci) [\#117](https://github.com/tharsis/evmos/pull/117) Enable automatic backport of PRs.
 
+## Bug Fixes
+
+* (build) [\#116](https://github.com/tharsis/evmos/pull/116) Fix `build-docker` command
 
 ## [v0.3.0] - 2021-11-24
 

Dockerfile

@@ -1,30 +1,23 @@
-FROM golang:alpine AS build-env
+FROM golang:stretch AS build-env
 
-# Set up dependencies
-ENV PACKAGES git build-base
-
-# Set working directory for the build
 WORKDIR /go/src/github.com/tharsis/evmos
 
-# Install dependencies
-RUN apk add --update $PACKAGES
-RUN apk add linux-headers
+RUN apt update
+RUN apt install git -y
 
-# Add source files
 COPY . .
 
-# Make the binary
 RUN make build
 
-# Final image
-FROM alpine
+FROM golang:stretch
+
+RUN apt update
+RUN apt install ca-certificates jq -y
 
-# Install ca-certificates
-RUN apk add --update ca-certificates jq
 WORKDIR /root
 
-# Copy over binaries from the build-env
 COPY --from=build-env /go/src/github.com/tharsis/evmos/build/evmosd /usr/bin/evmosd
 
-# Run evmosd by default
-CMD ["evmosd"]
+EXPOSE 26656 26657 1317 9090
+
+CMD ["evmosd"]

Makefile

@@ -14,6 +14,11 @@ SIMAPP = ./app
 HTTPS_GIT := https://github.com/tharsis/evmos.git
 DOCKER := $(shell which docker)
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf
+NAMESPACE := tharsis
+PROJECT := evmos
+DOCKER_IMAGE := $(NAMESPACE)/$(PROJECT)
+COMMIT_HASH := $(shell git rev-parse --short=10 HEAD)
+DOCKER_TAG := $(COMMIT_HASH)
 
 export GO111MODULE = on
 
@@ -118,15 +123,15 @@ $(BUILD_TARGETS): go.sum $(BUILDDIR)/
 $(BUILDDIR)/:
 	mkdir -p $(BUILDDIR)/
 
-docker-build:
+build-docker:
 	# TODO replace with kaniko
 	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}
 	# update old container
 	docker rm evmos || true
 	# create a new container from the latest image
-	docker create --name evmos -t -i tharsis/evmos:latest evmos
+	docker create --name evmos -t -i ${DOCKER_IMAGE}:latest evmos
 	# move the binaries to the ./build directory
 	mkdir -p ./build/
 	docker cp evmos:/usr/bin/evmosd ./build/

docs/quickstart/installation.md

@@ -57,14 +57,19 @@ evmosd version
 You can build {{ $themeConfig.project.name }} using Docker by running:
 
 ```bash
-make docker-build
+make build-docker
 ```
 
-This will install the binaries on the `./build` directory. Now, check that the binaries have been
-successfully installed:
+The command above will create a docker container: `tharsis/evmos:latest`. Now you can run `evmosd` in the container.
 
 ```bash
-evmosd version
+docker run -it -p 26657:26657 -p 26656:26656 -v ~/.evmosd/:/root/.evmosd tharsis/evmos:latest evmosd version
+
+# To initialize
+# docker run -it -p 26657:26657 -p 26656:26656 -v ~/.evmosd/:/root/.evmosd tharsis/evmos:latest evmosd init test-chain --chain-id test_9000-2
+
+# To run
+# docker run -it -p 26657:26657 -p 26656:26656 -v ~/.evmosd/:/root/.evmosd tharsis/evmos:latest evmosd start
 ```
 
 ### Releases