From dd158651e7cb1c1277842aec90d6af82ee637f00 Mon Sep 17 00:00:00 2001 From: kev Date: Thu, 1 Oct 2015 18:28:28 +0800 Subject: [PATCH] update --- etcd-arm/Dockerfile | 9 ++------- etcd-arm/etc/confd/conf.d/shadowsocks.toml | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/etcd-arm/Dockerfile b/etcd-arm/Dockerfile index 5b954f6..b204364 100644 --- a/etcd-arm/Dockerfile +++ b/etcd-arm/Dockerfile @@ -3,11 +3,6 @@ # FROM scratch -MAINTAINER kev - -ADD ca-certificates.crt /etc/ssl/certs/ -ADD etcd /usr/local/bin/ - +ADD etcd / EXPOSE 2379 2380 4001 7001 - -ENTRYPOINT ["etcd"] +ENTRYPOINT ["/etcd"] diff --git a/etcd-arm/etc/confd/conf.d/shadowsocks.toml b/etcd-arm/etc/confd/conf.d/shadowsocks.toml index b9970ba..4d6b23c 100644 --- a/etcd-arm/etc/confd/conf.d/shadowsocks.toml +++ b/etcd-arm/etc/confd/conf.d/shadowsocks.toml @@ -4,4 +4,5 @@ dest = "/etc/shadowsocks/client.json" keys = [ "/services/shadowsocks" ] +check_cmd = "jq . {{.src}}" #reload_cmd = "supervisorctl update"