chore(docker): use conf_util in docker-entrypoint

.gitignore

@@ -25,4 +25,5 @@ node_modules/
 go.sum
 _build
 _packages
-jmeter_logs
+jmeter_logs
+kuiper_conf_util

deploy/docker/Dockerfile

@@ -4,10 +4,15 @@ COPY . /go/kuiper
 
 WORKDIR /go/kuiper
 
-RUN apt update && apt install -y upx pkg-config libczmq-dev \
-    && make build_with_edgex \
-    && ln -s /go/kuiper/_build/kuiper-$(git describe --tags --always)-$(uname -s | tr "[A-Z]" "[a-z]")-$(uname -m) /usr/local/kuiper \
-    && ln -s /go/kuiper/deploy/docker/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
+RUN apt update && apt install -y upx pkg-config libczmq-dev
+
+RUN make build_with_edgex \
+    && ln -s /go/kuiper/_build/kuiper-$(git describe --tags --always)-$(uname -s | tr "[A-Z]" "[a-z]")-$(uname -m) /usr/local/kuiper 
+
+RUN go build  -o kuiper_conf_util deploy/docker/conf_util.go \
+    && ln -s /go/kuiper/deploy/kuiper_conf_util /usr/bin/kuiper_conf_util
+
+RUN ln -s /go/kuiper/deploy/docker/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
 
 EXPOSE 9081 20498
 

deploy/docker/Dockerfile-alpine

@@ -4,21 +4,24 @@ COPY . /go/kuiper
 
 WORKDIR /go/kuiper
 
-RUN apk add upx gcc make git libc-dev binutils-gold pkgconfig zeromq-dev && make build_with_edgex
+RUN apk add upx gcc make git libc-dev binutils-gold pkgconfig zeromq-dev 
+RUN go build  -o kuiper_conf_util deploy/docker/conf_util.go
+RUN make build_with_edgex
 
 FROM alpine:3.10
 
-COPY --from=builder /go/kuiper/_build/kuiper-* /kuiper/
 COPY ./deploy/docker/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
+COPY --from=builder /go/kuiper/kuiper_conf_util /usr/bin/kuiper_conf_util
+COPY --from=builder /go/kuiper/_build/kuiper-* /kuiper/
 
 RUN apk add sed libzmq
 
 WORKDIR /kuiper
 
-EXPOSE 9081 20498
-
 ENV KUIPER_HOME /kuiper
 
+EXPOSE 9081 20498
+
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
 
 CMD ["./bin/server"]

deploy/docker/Dockerfile-slim

@@ -4,21 +4,24 @@ COPY . /go/kuiper
 
 WORKDIR /go/kuiper
 
-RUN apt update && apt install -y upx pkg-config libczmq-dev && make build_with_edgex
+RUN apt update && apt install -y upx pkg-config libczmq-dev
+RUN go build  -o kuiper_conf_util deploy/docker/conf_util.go
+RUN make build_with_edgex
 
 FROM debian:10
 
-COPY --from=builder /go/kuiper/_build/kuiper-* /kuiper/
 COPY ./deploy/docker/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
+COPY --from=builder /go/kuiper/kuiper_conf_util /usr/bin/kuiper_conf_util
+COPY --from=builder /go/kuiper/_build/kuiper-* /kuiper/
 
 RUN apt update && apt install -y pkg-config libczmq-dev
 
 WORKDIR /kuiper
 
-EXPOSE 9081 20498
-
 ENV KUIPER_HOME /kuiper
 
+EXPOSE 9081 20498
+
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
 
 CMD ["./bin/server"]

deploy/docker/conf_util.go

@@ -11,9 +11,12 @@ import (
 var khome = os.Getenv("KUIPER_HOME")
 
 var fileMap = map[string]string{
-	"edgex":       khome + "etc/sources/edgex.yaml",
-	"mqtt_source": khome + "etc/mqtt_source.yaml",
-	"kuiper":      khome + "etc/kuiper.yaml",
+	"edgex":       khome + "/etc/sources/edgex.yaml",
+	"random":      khome + "/etc/sources/random.yaml",
+	"zmq":         khome + "/etc/sources/zmq.yaml",
+	"mqtt_source": khome + "/etc/mqtt_source.yaml",
+	"kuiper":      khome + "/etc/kuiper.yaml",
+	"client":      khome + "/etc/client.yaml",
 }
 
 var file_keys_map = map[string]map[string]string{

deploy/docker/docker-entrypoint.sh

@@ -141,4 +141,6 @@ if [ ! -z "$EDGEX_SERVICE_SERVER" ]; then
     echo "edgex.default.serviceServer = $EDGEX_SERVICE_SERVER"
 fi
 
+/usr/bin/kuiper_conf_util
+
 exec "$@"