From ca4ca1ae6f87c6fcbf9c486722f36b4f07166187 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 25 Feb 2020 21:56:15 -0800 Subject: update docker local dev env --- docker/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 docker/Makefile (limited to 'docker/Makefile') diff --git a/docker/Makefile b/docker/Makefile new file mode 100644 index 000000000..4993fb2a5 --- /dev/null +++ b/docker/Makefile @@ -0,0 +1,8 @@ +all: gen + +.PHONY : gen + +gen: + cd ../weed; GOOS=linux go build; mv weed ../docker/ + docker-compose -f local-dev-compose.yml -p seaweedfs up + rm ./weed -- cgit v1.2.3 From c4de81434711c6734d8dacef14ad5dfa45977d70 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 26 Feb 2020 16:46:29 -0800 Subject: docker: add cluster mode --- docker/Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'docker/Makefile') diff --git a/docker/Makefile b/docker/Makefile index 4993fb2a5..5a40d36d2 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -2,7 +2,18 @@ all: gen .PHONY : gen -gen: +gen: dev + +build: cd ../weed; GOOS=linux go build; mv weed ../docker/ + docker build --no-cache -t chrislusf/seaweedfs:local -f Dockerfile.go_build . + rm ./weed + +dev: build docker-compose -f local-dev-compose.yml -p seaweedfs up + +cluster: build + docker-compose -f local-cluster-compose.yml -p seaweedfs up + +clean: rm ./weed -- cgit v1.2.3 From 4dec5e0e4ae9da6d7749128a81d7010f7a3cd801 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 1 Mar 2020 18:23:07 -0800 Subject: fix dockerhub build --- docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/Makefile') diff --git a/docker/Makefile b/docker/Makefile index 5a40d36d2..166188bc3 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -6,7 +6,7 @@ gen: dev build: cd ../weed; GOOS=linux go build; mv weed ../docker/ - docker build --no-cache -t chrislusf/seaweedfs:local -f Dockerfile.go_build . + docker build --no-cache -t chrislusf/seaweedfs:local -f Dockerfile.local . rm ./weed dev: build -- cgit v1.2.3