diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | docker/Dockerfile.local | 2 | ||||
| -rw-r--r-- | docker/Makefile | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 9a8e5d112..8fc65d330 100644 --- a/.gitignore +++ b/.gitignore @@ -91,4 +91,6 @@ weed/mq/client/cmd/weed_pub/weed_pub docker/weed # test generated files -weed/*/*.jpg
\ No newline at end of file +weed/*/*.jpg +docker/weed_sub +docker/weed_pub diff --git a/docker/Dockerfile.local b/docker/Dockerfile.local index 53cfd9571..b87c0d8e9 100644 --- a/docker/Dockerfile.local +++ b/docker/Dockerfile.local @@ -1,6 +1,8 @@ FROM alpine AS final LABEL author="Chris Lu" COPY ./weed /usr/bin/ +COPY ./weed_pub /usr/bin/ +COPY ./weed_sub /usr/bin/ RUN mkdir -p /etc/seaweedfs COPY ./filer.toml /etc/seaweedfs/filer.toml COPY ./entrypoint.sh /entrypoint.sh diff --git a/docker/Makefile b/docker/Makefile index 08cd8775e..5f43fb95c 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -9,6 +9,8 @@ binary: export SWCOMMIT=$(shell git rev-parse --short HEAD) export SWLDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=$(SWCOMMIT)" cd ../weed && CGO_ENABLED=$(cgo) GOOS=linux go build $(options) -tags "$(tags)" -ldflags "-s -w -extldflags -static $(SWLDFLAGS)" && mv weed ../docker/ + cd ../weed/mq/client/cmd/weed_pub && CGO_ENABLED=$(cgo) GOOS=linux go build && mv weed_pub ../../../../../docker/ + cd ../weed/mq/client/cmd/weed_sub && CGO_ENABLED=$(cgo) GOOS=linux go build && mv weed_sub ../../../../../docker/ binary_race: options = -race binary_race: cgo = 1 |