Update Dockerfile (#10)

* Update Dockerfile

* Update CHANGES.md

Author: mosuka

CHANGES.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 
 ## Unreleased
+
+
+## 0.1.1 (2019-11-06)
+- Update Dockerfile #10 @mosuka
 - Fixed typo in error message #6 @eko
 - Dockerfile for tests and profit #5 @iyesin
 - Small typo in get command example fixed #4 @msmakhlouf

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bayard"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Minoru Osuka <[email protected]>"]
 edition = "2018"
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:slim-stretch as builder
+FROM rust:1.38.0-slim-stretch as builder
 
 WORKDIR /repo
 ADD . /repo/
@@ -13,4 +13,5 @@ WORKDIR /
 COPY --from=builder /repo/bin /usr/local/bin
 COPY --from=builder /repo/etc/* /etc/
 EXPOSE 5000
-ENTRYPOINT [ "bayard", "serve" ]
+ENTRYPOINT [ "bayard" ]
+CMD [ "serve" ]

Makefile

@@ -1,6 +1,11 @@
-BIN_DIR = $(CURDIR)/bin
-DATA_DIR = $(CURDIR)/data
+BIN_DIR ?= $(CURDIR)/bin
+DATA_DIR ?= $(CURDIR)/data
 CARGO_TARGET_DIR ?= $(CURDIR)/target
+VERSION ?=
+
+ifeq ($(VERSION),)
+  VERSION = $(shell cargo metadata --no-deps --format-version=1 | jq -r '.packages[] | select(.name=="bayard") | .version')
+endif
 
 clean:
 	rm -rf $(BIN_DIR)
@@ -18,3 +23,14 @@ build:
 	cargo build --release
 	mkdir -p $(BIN_DIR)
 	cp $(CARGO_TARGET_DIR)/release/bayard $(BIN_DIR)/
+
+docker-build:
+	docker build -t bayardsearch/bayard:latest .
+	docker tag bayardsearch/bayard:latest bayardsearch/bayard:$(VERSION)
+
+docker-push:
+	docker push bayardsearch/bayard:latest
+	docker push bayardsearch/bayard:$(VERSION)
+
+docker-clean:
+	docker rmi -f $(shell docker images --filter "dangling=true" -q --no-trunc)

README.md

@@ -214,3 +214,27 @@ $ ./bin/bayard leave \
     --peers="1=0.0.0.0:5001,2=0.0.0.0:5002" \
     --leader-id=1
 ```
+
+
+## Bayard on Docker
+
+### Pulling Docker container image from docker.io
+
+You can pull the Docker container image already registered in docker.io like so:
+
+```
+$ docker pull bayardsearch/bayard:latest
+```
+
+Check the available version at the following URL:
+https://hub.docker.com/r/bayardsearch/bayard/tags/
+
+### Running Docker container
+
+Running a Bayard on Docker like so:
+
+```
+$ docker run --rm --name bayard \
+    -p 5000:5000 \
+    bayardsearch/bayard:latest
+```