remove config and wallet from docker construct (#578)

.gitignore

@@ -27,3 +27,4 @@ cscope*
 neosnapshot/*
 glide.lock
 *.iml
+docker/payload

Makefile

@@ -8,8 +8,6 @@ DBUILD=docker build
 DRUN=docker run
 DOCKER_NS ?= ontio
 DOCKER_TAG=$(ARCH)-$(VERSION)
-ONT_CFG_IN_DOCKER=config.json
-WALLET_FILE=wallet.dat
 
 SRC_FILES = $(shell git ls-files | grep -e .go$ | grep -v _test.go)
 TOOLS=./tools
@@ -65,17 +63,11 @@ all-cross: ontology-cross tools-cross abi
 format:
 	$(GOFMT) -w main.go
 
-$(WALLET_FILE):
-	@if [ ! -e $(WALLET_FILE) ]; then $(error Please create wallet file first) ; fi
-
-docker/payload: docker/build/bin/ontology docker/Dockerfile $(ONT_CFG_IN_DOCKER) $(WALLET_FILE)
+docker/payload: docker/build/bin/ontology docker/Dockerfile
 	@echo "Building ontology payload"
 	@mkdir -p $@
 	@cp docker/Dockerfile $@
 	@cp docker/build/bin/ontology $@
-	@cp -f $(ONT_CFG_IN_DOCKER) $@/config.json
-	@cp -f $(WALLET_FILE) $@
-	@tar czf $@/config.tgz -C $@ config.json $(WALLET_FILE)
 	@touch $@
 
 docker/build/bin/%: Makefile

README.md

@@ -289,7 +289,7 @@ Please ensure there are docker environment in your machine.
 
     - Use command `docker run ontio/ontology`to run ontology；
 
-    - If you need to allow interactive keyboard input while the image is running, you can use the `docker -ti run ontio/ontology` command to start the image;
+    - If you need to allow interactive keyboard input while the image is running, you can use the `docker run -ti ontio/ontology` command to start the image;
 
     - If you need to keep the data generated by image at runtime, you can refer to the data persistence function of docker (e.g. valume);
 

README_CN.md

@@ -41,6 +41,7 @@ Ontology致力于创建一个组件化、可自由配置、跨链支持、高性
         * [单机部署配置](#单机部署配置)
         * [多机部署配置](#多机部署配置)
     * [运行](#运行)
+        * [使用docker运行](#使用docker运行)
     * [ONT转账调用示例](#ont转账调用示例)
 * [贡献代码](#贡献代码)
 * [开源社区](#开源社区)
@@ -264,7 +265,7 @@ ontology的运行支持以下4种方式
 
     - 使用命令`docker run ontio/ontology`运行ontology；
 
-    - 如果需要使镜像运行时接受交互式键盘输入，则使用`docker -ti run ontio/ontology`命令启动镜像即可；
+    - 如果需要使镜像运行时接受交互式键盘输入，则使用`docker run -ti ontio/ontology`命令启动镜像即可；
 
     - 如果需要保留镜像每次运行时的数据，可以参考docker的数据持久化功能（例如 valume）；
 

docker/Dockerfile

@@ -3,7 +3,6 @@ FROM tianon/ubuntu-core:14.04
 ENV ONTOLOGY_PATH /var/ontology
 RUN mkdir -p $ONTOLOGY_PATH
 COPY ontology $ONTOLOGY_PATH
-ADD config.tgz $ONTOLOGY_PATH
 EXPOSE 20334 20335 20336 20337 20338 20339
 WORKDIR $ONTOLOGY_PATH
 ENTRYPOINT ["./ontology"]