diff --git a/Dockerfile b/Dockerfile index 2e48cd3..25bb21d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM golang:1.12 as build +FROM golang:1.12-alpine3.10 as build ENV GO111MODULE on -ENV GOPROXY "https://goproxy.io" +ENV GOPROXY "https://goproxy.cn" WORKDIR /opt RUN mkdir etcdkeeper @@ -27,4 +27,5 @@ ADD assets assets EXPOSE ${PORT} -ENTRYPOINT ./etcdkeeper.bin -h $HOST -p $PORT \ No newline at end of file +ENTRYPOINT ["./etcdkeeper.bin"] +CMD ["-h", "$HOST", "-p", "$PORT"] diff --git a/README.md b/README.md index d66f64f..14fa142 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,11 @@ use etcd auth -timeout int ETCD client connect timeout + -baseurl string + If you deploy etcdkeeper into a sub Dir + -default_etcd string + default etcd address, empty if do not want auto connect (default "127.0.0.1:2379") + ``` * Open your browser and enter the address: http://127.0.0.1:8080/etcdkeeper * Click on the version of the title to select the version of ETCD. The default is V3. Reopening will remember your choice. diff --git a/assets/etcdkeeper/index.html b/assets/etcdkeeper/index.html index 8f31c0b..918a2f7 100644 --- a/assets/etcdkeeper/index.html +++ b/assets/etcdkeeper/index.html @@ -8,6 +8,7 @@ + @@ -32,7 +33,7 @@

ETCD Keeper v3

- +
@@ -92,7 +93,7 @@

Submit

- +
@@ -110,7 +111,7 @@

Submit

- +
@@ -131,10 +132,10 @@

json

-
-
version 3
-
version 2
-
+
+
version 3
+
version 2
+