From 3775211962f9595e9c00600d23ac841646a7b22a Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sun, 22 Mar 2020 18:35:45 -0700
Subject: [PATCH] optimize entrypoint for docker

---
 docker/entrypoint.sh             | 23 +++--------------------
 docker/local-cluster-compose.yml |  6 +++---
 docker/local-dev-compose.yml     |  6 +++---
 docker/seaweedfs-compose.yml     |  2 +-
 docker/seaweedfs-dev-compose.yml |  6 +++---
 5 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 791527d3a..7ce0fde8d 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -3,44 +3,27 @@
 case "$1" in
 
   'master')
-  	ARGS="-mdir /data"
-	# Is this instance linked with an other master? (Docker commandline "--link master1:master")
-	if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then
-		ARGS="$ARGS -peers=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT"
-	fi
+  	ARGS="-mdir=/data -volumePreallocate -volumeSizeLimitMB=1024"
   	exec /usr/bin/weed $@ $ARGS
 	;;
 
   'volume')
-  	ARGS="-ip `hostname -i` -dir /data"
-	# Is this instance linked with a master? (Docker commandline "--link master1:master")
-  	if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then
-		ARGS="$ARGS -mserver=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT"
-	fi
+  	ARGS="-dir=/data -max=0"
   	exec /usr/bin/weed $@ $ARGS
 	;;
 
   'server')
-  	ARGS="-ip `hostname -i` -dir /data"
-  	if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then
-		ARGS="$ARGS -master.peers=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT"
-	fi
+  	ARGS="-ip=`hostname -i` -dir=/data -volume.max=0 -master.volumePreallocate -master.volumeSizeLimitMB=1024"
   	exec /usr/bin/weed $@ $ARGS
   	;;
 
   'filer')
   	ARGS=""
-  	if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then
-		ARGS="$ARGS -master=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT"
-	fi
   	exec /usr/bin/weed $@ $ARGS
 	;;
 
   's3')
   	ARGS="-domainName=$S3_DOMAIN_NAME -key.file=$S3_KEY_FILE -cert.file=$S3_CERT_FILE"
-  	if [ -n "$FILER_PORT_8888_TCP_ADDR" ] ; then
-		ARGS="$ARGS -filer=$FILER_PORT_8888_TCP_ADDR:$FILER_PORT_8888_TCP_PORT"
-	fi
   	exec /usr/bin/weed $@ $ARGS
 	;;
 
diff --git a/docker/local-cluster-compose.yml b/docker/local-cluster-compose.yml
index 0b6860fa1..a1ac824e7 100644
--- a/docker/local-cluster-compose.yml
+++ b/docker/local-cluster-compose.yml
@@ -24,7 +24,7 @@ services:
     ports:
       - 8080:8080
       - 18080:18080
-    command: '-v=2 volume -max=5 -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume'
+    command: 'volume -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume'
     depends_on:
       - master0
       - master1
@@ -34,7 +34,7 @@ services:
     ports:
       - 8888:8888
       - 18888:18888
-    command: '-v=4 filer -master="master0:9333,master1:9334,master2:9335"'
+    command: 'filer -master="master0:9333,master1:9334,master2:9335"'
     depends_on:
       - master0
       - master1
@@ -44,7 +44,7 @@ services:
     image: chrislusf/seaweedfs:local
     ports:
       - 8333:8333
-    command: '-v=4 s3 -filer="filer:8888"'
+    command: 's3 -filer="filer:8888"'
     depends_on:
       - master0
       - master1
diff --git a/docker/local-dev-compose.yml b/docker/local-dev-compose.yml
index 5ff42ed28..f6fd0f4ce 100644
--- a/docker/local-dev-compose.yml
+++ b/docker/local-dev-compose.yml
@@ -12,7 +12,7 @@ services:
     ports:
       - 8080:8080
       - 18080:18080
-    command: '-v=2 volume -max=5 -mserver="master:9333" -port=8080 -ip=volume'
+    command: "volume -mserver=master:9333 -port=8080 -ip=volume"
     depends_on:
       - master
   filer:
@@ -20,7 +20,7 @@ services:
     ports:
       - 8888:8888
       - 18888:18888
-    command: '-v=4 filer -master="master:9333"'
+    command: 'filer -master="master:9333"'
     depends_on:
       - master
       - volume
@@ -28,7 +28,7 @@ services:
     image: chrislusf/seaweedfs:local
     ports:
       - 8333:8333
-    command: '-v=4 s3 -filer="filer:8888"'
+    command: 's3 -filer="filer:8888"'
     depends_on:
       - master
       - volume
diff --git a/docker/seaweedfs-compose.yml b/docker/seaweedfs-compose.yml
index 35509c541..70d005017 100644
--- a/docker/seaweedfs-compose.yml
+++ b/docker/seaweedfs-compose.yml
@@ -12,7 +12,7 @@ services:
     ports:
       - 8080:8080
       - 18080:18080
-    command: 'volume -max=15 -mserver="master:9333" -port=8080'
+    command: 'volume -mserver="master:9333" -port=8080'
     depends_on:
       - master
   filer:
diff --git a/docker/seaweedfs-dev-compose.yml b/docker/seaweedfs-dev-compose.yml
index 197510a9f..75801102e 100644
--- a/docker/seaweedfs-dev-compose.yml
+++ b/docker/seaweedfs-dev-compose.yml
@@ -12,7 +12,7 @@ services:
     ports:
       - 8080:8080
       - 18080:18080
-    command: '-v=2 volume -max=5 -mserver="master:9333" -port=8080 -ip=volume'
+    command: 'volume -mserver="master:9333" -port=8080 -ip=volume'
     depends_on:
       - master
   filer:
@@ -20,7 +20,7 @@ services:
     ports:
       - 8888:8888
       - 18888:18888
-    command: '-v=4 filer -master="master:9333"'
+    command: 'filer -master="master:9333"'
     depends_on:
       - master
       - volume
@@ -28,7 +28,7 @@ services:
     image: chrislusf/seaweedfs:dev # use a remote dev image
     ports:
       - 8333:8333
-    command: '-v=4 s3 -filer="filer:8888"'
+    command: 's3 -filer="filer:8888"'
     depends_on:
       - master
       - volume