diff --git a/Docker-dev b/Docker-dev new file mode 100644 index 0000000000000000000000000000000000000000..d484cb661e8f8accd8a2d992b0e152485867930f --- /dev/null +++ b/Docker-dev @@ -0,0 +1,7 @@ +FROM golang + +WORKDIR /go/src/app +COPY . . +RUN make tools build-all && ln -s bin/linux/jcli /usr/local/bin/jcli + +ENTRYPOINT ["jcli"] diff --git a/Makefile b/Makefile index ca1d88e6b3988b033736c9b5267ed5c664ee1930..6b7171e062f30265e1473eddd8e4a7c2fb879bfc 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,9 @@ clean: ## Clean the generated artifacts copy: darwin sudo cp bin/darwin/$(NAME) $(shell which jcli) +copy-linux: linux + cp bin/linux/$(NAME) /usr/local/bin/jcli + tools: i18n-tools go get -u golang.org/x/lint/golint @@ -91,7 +94,10 @@ image: docker build . -t jenkinszh/jcli image-win: - docker build . -t jenkinszh/jcli:win + docker build . -t jenkinszh/jcli:win -f Dockerfile-win image-darwin: - docker build . -t jenkinszh/jcli:darwin \ No newline at end of file + docker build . -t jenkinszh/jcli:darwin -f Dockerfile-darwin + +image-dev: + docker build . -t jenkinszh/jcli:dev -f Docker-dev \ No newline at end of file diff --git a/README-zh.md b/README-zh.md index bb0889a4faf4635d6b9990cef09cbdeeba084e36..7eaec151235112d9daf8e44fed91c55484c11412 100644 --- a/README-zh.md +++ b/README-zh.md @@ -67,6 +67,13 @@ sudo mv jcli /usr/local/bin/ |`jenkinszh/jcli`|Linux| |`jenkinszh/jcli:darwin`|Mac| |`jenkinszh/jcli:win`|Windows,你可以从 `/usr/local/bin/jcli.exe` 这里找到可执行程序| +|`jenkinszh/jcli:dev`|你可以从这里找到开发版本 `/go/src/app/bin/linux/jcli` 、`/go/src/app/bin/darwin/jcli` 或 `/go/src/app/bin/windows/jcli.exe`| + +想要体验最新的特性?您可以下载不同平台下的开发版本: + +- `jcli_id=$(docker create jenkinszh/jcli:dev) && sudo docker cp $jcli_id:/go/src/app/bin/linux/jcli . && docker rm -v $jcli_id` +- `jcli_id=$(docker create jenkinszh/jcli:dev) && sudo docker cp $jcli_id:/go/src/app/bin/darwin/jcli . && docker rm -v $jcli_id` +- `jcli_id=$(docker create jenkinszh/jcli:dev) && sudo docker cp $jcli_id:/go/src/app/bin/windows/jcli.exe . && docker rm -v $jcli_id` # 入门 diff --git a/README.md b/README.md index 7cbfdcb7a4ec3ba0868f2dadb646f97e054d4218..1cd296ce55814e88a026e9644ef53802533dfdba 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,13 @@ Download different version of OS? Just need to change the docker image tag: |`jenkinszh/jcli`|Linux| |`jenkinszh/jcli:darwin`|Mac| |`jenkinszh/jcli:win`|Windows, you can find it from `/usr/local/bin/jcli.exe`| +|`jenkinszh/jcli:dev`|Developing version, find can find them from `/go/src/app/bin/linux/jcli` or `/go/src/app/bin/darwin/jcli` or `/go/src/app/bin/windows/jcli.exe`| + +Want to try the latest features? Download the developing version of different platform: + +- `jcli_id=$(docker create jenkinszh/jcli:dev) && sudo docker cp $jcli_id:/go/src/app/bin/linux/jcli . && docker rm -v $jcli_id` +- `jcli_id=$(docker create jenkinszh/jcli:dev) && sudo docker cp $jcli_id:/go/src/app/bin/darwin/jcli . && docker rm -v $jcli_id` +- `jcli_id=$(docker create jenkinszh/jcli:dev) && sudo docker cp $jcli_id:/go/src/app/bin/windows/jcli.exe . && docker rm -v $jcli_id` # Get started