From 94526f8e10a5fa9a22f38f46a82e411eaa991892 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 25 Jan 2020 07:50:54 -0800 Subject: 2-stage docker dev image build fix https://github.com/chrislusf/seaweedfs/issues/1047 --- docker/local-dev-compose.yml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 docker/local-dev-compose.yml (limited to 'docker/local-dev-compose.yml') diff --git a/docker/local-dev-compose.yml b/docker/local-dev-compose.yml new file mode 100644 index 000000000..c2f588a60 --- /dev/null +++ b/docker/local-dev-compose.yml @@ -0,0 +1,43 @@ +version: '2' + +services: + master: + build: + context: . + dockerfile: Dockerfile.go_build + ports: + - 9333:9333 + - 19333:19333 + command: "master -ip=master" + volume: + build: + context: . + dockerfile: Dockerfile.go_build + ports: + - 8080:8080 + - 18080:18080 + command: '-v=2 volume -max=5 -mserver="master:9333" -port=8080 -ip=volume' + depends_on: + - master + filer: + build: + context: . + dockerfile: Dockerfile.go_build + ports: + - 8888:8888 + - 18888:18888 + command: '-v=4 filer -master="master:9333"' + depends_on: + - master + - volume + s3: + build: + context: . + dockerfile: Dockerfile.go_build + ports: + - 8333:8333 + command: '-v=4 s3 -filer="filer:8888"' + depends_on: + - master + - volume + - filer -- cgit v1.2.3 From 9863f51cc8280a613eb816f5b73bda0fcc60f459 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 25 Jan 2020 08:04:45 -0800 Subject: use docker built binaries for faster automated release --- docker/local-dev-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docker/local-dev-compose.yml') diff --git a/docker/local-dev-compose.yml b/docker/local-dev-compose.yml index c2f588a60..02ed1e6a3 100644 --- a/docker/local-dev-compose.yml +++ b/docker/local-dev-compose.yml @@ -4,7 +4,7 @@ services: master: build: context: . - dockerfile: Dockerfile.go_build + dockerfile: Dockerfile ports: - 9333:9333 - 19333:19333 @@ -12,7 +12,7 @@ services: volume: build: context: . - dockerfile: Dockerfile.go_build + dockerfile: Dockerfile ports: - 8080:8080 - 18080:18080 @@ -22,7 +22,7 @@ services: filer: build: context: . - dockerfile: Dockerfile.go_build + dockerfile: Dockerfile ports: - 8888:8888 - 18888:18888 @@ -33,7 +33,7 @@ services: s3: build: context: . - dockerfile: Dockerfile.go_build + dockerfile: Dockerfile ports: - 8333:8333 command: '-v=4 s3 -filer="filer:8888"' -- cgit v1.2.3 From 3f6e0e34cbb75fa440c8ccd182adb68ac7301847 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 25 Jan 2020 08:17:59 -0800 Subject: Revert "use docker built binaries for faster automated release" This reverts commit 9863f51cc8280a613eb816f5b73bda0fcc60f459. --- docker/local-dev-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docker/local-dev-compose.yml') diff --git a/docker/local-dev-compose.yml b/docker/local-dev-compose.yml index 02ed1e6a3..c2f588a60 100644 --- a/docker/local-dev-compose.yml +++ b/docker/local-dev-compose.yml @@ -4,7 +4,7 @@ services: master: build: context: . - dockerfile: Dockerfile + dockerfile: Dockerfile.go_build ports: - 9333:9333 - 19333:19333 @@ -12,7 +12,7 @@ services: volume: build: context: . - dockerfile: Dockerfile + dockerfile: Dockerfile.go_build ports: - 8080:8080 - 18080:18080 @@ -22,7 +22,7 @@ services: filer: build: context: . - dockerfile: Dockerfile + dockerfile: Dockerfile.go_build ports: - 8888:8888 - 18888:18888 @@ -33,7 +33,7 @@ services: s3: build: context: . - dockerfile: Dockerfile + dockerfile: Dockerfile.go_build ports: - 8333:8333 command: '-v=4 s3 -filer="filer:8888"' -- 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/local-dev-compose.yml | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) (limited to 'docker/local-dev-compose.yml') diff --git a/docker/local-dev-compose.yml b/docker/local-dev-compose.yml index c2f588a60..51bea642f 100644 --- a/docker/local-dev-compose.yml +++ b/docker/local-dev-compose.yml @@ -2,42 +2,34 @@ version: '2' services: master: - build: - context: . - dockerfile: Dockerfile.go_build + image: chrislusf/seaweedfs:local ports: - - 9333:9333 - - 19333:19333 + - 9333:9333 + - 19333:19333 command: "master -ip=master" volume: - build: - context: . - dockerfile: Dockerfile.go_build + image: chrislusf/seaweedfs:local ports: - - 8080:8080 - - 18080:18080 + - 8080:8080 + - 18080:18080 command: '-v=2 volume -max=5 -mserver="master:9333" -port=8080 -ip=volume' depends_on: - - master + - master filer: - build: - context: . - dockerfile: Dockerfile.go_build + image: chrislusf/seaweedfs:local ports: - - 8888:8888 - - 18888:18888 + - 8888:8888 + - 18888:18888 command: '-v=4 filer -master="master:9333"' depends_on: - - master - - volume + - master + - volume s3: - build: - context: . - dockerfile: Dockerfile.go_build + image: chrislusf/seaweedfs:local ports: - - 8333:8333 - command: '-v=4 s3 -filer="filer:8888"' + - 8333:8333 + command: '-v=4 s3 -filer="filer:8888" -waitForFiler' depends_on: - - master - - volume - - filer + - master + - volume + - filer -- cgit v1.2.3 From f69a1694e73bb2e24e4c0b0160bce6c133a7d0f8 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 26 Feb 2020 16:50:40 -0800 Subject: clean up waitForFiler option --- docker/local-dev-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/local-dev-compose.yml') diff --git a/docker/local-dev-compose.yml b/docker/local-dev-compose.yml index 51bea642f..5ff42ed28 100644 --- a/docker/local-dev-compose.yml +++ b/docker/local-dev-compose.yml @@ -28,7 +28,7 @@ services: image: chrislusf/seaweedfs:local ports: - 8333:8333 - command: '-v=4 s3 -filer="filer:8888" -waitForFiler' + command: '-v=4 s3 -filer="filer:8888"' depends_on: - master - volume -- cgit v1.2.3