diff --git a/blobstore/Dockerfile b/blobstore/Dockerfile index ac3e28879..c79988dd4 100755 --- a/blobstore/Dockerfile +++ b/blobstore/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16 +FROM golang:1.17 ENV JAVA_HOME=bin/jdk1.8.0_321 @@ -7,14 +7,14 @@ ENV PATH=$PATH:$JAVA_HOME/bin WORKDIR /apps VOLUME ["/apps/conf", "/apps/bin"] -COPY ./bin/ /apps/bin -COPY ./cmd/clustermgr/clustermgr1.conf /apps/conf/clustermgr1.conf -COPY ./cmd/clustermgr/clustermgr2.conf /apps/conf/clustermgr2.conf -COPY ./cmd/clustermgr/clustermgr3.conf /apps/conf/clustermgr3.conf -COPY ./cmd/blobnode/blobnode.conf /apps/conf/blobnode.conf -COPY ./cmd/access/access.conf /apps/conf/access.conf -COPY ./cmd/scheduler/scheduler.conf /apps/conf/scheduler.conf -COPY ./cmd/proxy/proxy.conf /apps/conf/proxy.conf -COPY ./cli/cli/cli.conf /apps/conf/blobstore-cli.conf -COPY ./start_docker.sh /apps/start_docker.sh -ENTRYPOINT ["/bin/sh", "-c", "/apps/start_docker.sh"] +COPY ./build/bin/blobstore/ /apps/bin/ +COPY ./blobstore/cmd/clustermgr/clustermgr1.conf /apps/conf/clustermgr1.conf +COPY ./blobstore/cmd/clustermgr/clustermgr2.conf /apps/conf/clustermgr2.conf +COPY ./blobstore/cmd/clustermgr/clustermgr3.conf /apps/conf/clustermgr3.conf +COPY ./blobstore/cmd/blobnode/blobnode.conf /apps/conf/blobnode.conf +COPY ./blobstore/cmd/access/access.conf /apps/conf/access.conf +COPY ./blobstore/cmd/scheduler/scheduler.conf /apps/conf/scheduler.conf +COPY ./blobstore/cmd/proxy/proxy.conf /apps/conf/proxy.conf +COPY ./blobstore/cli/cli/cli.conf /apps/conf/blobstore-cli.conf +COPY ./blobstore/start_docker.sh /apps/start_docker.sh +ENTRYPOINT ["/bin/sh", "-c", "/apps/start_docker.sh"] \ No newline at end of file diff --git a/blobstore/run.sh b/blobstore/run.sh index 33d754142..403b115db 100755 --- a/blobstore/run.sh +++ b/blobstore/run.sh @@ -42,6 +42,7 @@ sleep 5 num=`ps -ef | egrep "./bin/blobstore/clustermgr" | egrep -v "vi|tail|grep" | wc -l` if [ $num -ne 3 ]; then echo "Failed to start clustermgr" + exit 1 fi sleep 15 diff --git a/blobstore/run_docker.sh b/blobstore/run_docker.sh index 16205ca76..d930b265b 100755 --- a/blobstore/run_docker.sh +++ b/blobstore/run_docker.sh @@ -18,13 +18,20 @@ EOF } source ./init.sh +if [ ! -d ./run/logs ];then + mkdir -p ./run/logs +fi + +RootPath=$(cd $(dirname $0)/..; pwd) log=./run/logs/docker.log name="blobstore:${tag}" + # build build() { INIT - docker build -t "${name}" -f Dockerfile . || return 1 + echo "start" + docker build -t "${name}" -f blobstore/Dockerfile ${RootPath} || return 1 return 0 } diff --git a/blobstore/start_docker.sh b/blobstore/start_docker.sh index c0defa61b..a61a78f39 100755 --- a/blobstore/start_docker.sh +++ b/blobstore/start_docker.sh @@ -24,6 +24,7 @@ sleep 5 num=`ps -ef | egrep "./bin/clustermgr" | egrep -v "vi|tail|grep" | wc -l` if [ $num -ne 3 ]; then echo "Failed to start clustermgr" + exit 1 fi sleep 15