Merge 100bd51 into 7c0d6f8

caicloud · Jan 18, 2017 · 48dd04b · 48dd04b
2 parents 7c0d6f8 + 100bd51
commit 48dd04b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,8 +4,7 @@ EXPOSE 7099
 
 WORKDIR /root
 
-RUN apk update && apk add ca-certificates && \
-    apk add tzdata && \
+RUN apk add --no-cache ca-certificates tzdata && \
     ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
     echo "Asia/Shanghai" > /etc/timezone
 

diff --git a/node_modules/swagger-ui/Dockerfile b/node_modules/swagger-ui/Dockerfile
diff --git a/scripts/build-worker-image.sh b/scripts/build-worker-image.sh
@@ -12,8 +12,10 @@ CYCLONE_ROOT=$(dirname "${BASH_SOURCE}")/..
 cd ${CYCLONE_ROOT}
 docker run --rm \
        -v `pwd`:/go/src/github.com/caicloud/cyclone \
-       -e GOPATH=/go:/go/src/github.com/caicloud/cyclone/vendor cargo.caicloud.io/caicloud/golang-gcc:1.6-alpine sh \
-       -c "cd /go/src/github.com/caicloud/cyclone/worker && go build cyclone-worker.go"
+       -w /go/src/github.com/caicloud/cyclone/worker \
+       -e GOPATH=/go:/go/src/github.com/caicloud/cyclone/vendor \
+       cargo.caicloud.io/caicloud/golang-gcc:1.6-alpine \
+       sh -c "go build cyclone-worker.go"
 
 docker build -t cargo.caicloud.io/caicloud/cyclone-worker ./worker