From ca4ca1ae6f87c6fcbf9c486722f36b4f07166187 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Tue, 25 Feb 2020 21:56:15 -0800
Subject: update docker local dev env

---
 docker/Dockerfile.go_build | 12 +++---------
 docker/Makefile            |  8 ++++++++
 docker/README.md           |  4 +---
 3 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 docker/Makefile

(limited to 'docker')

diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build
index 306ce3aa1..b4a7b6504 100644
--- a/docker/Dockerfile.go_build
+++ b/docker/Dockerfile.go_build
@@ -1,15 +1,9 @@
-FROM frolvlad/alpine-glibc as builder
-RUN apk add git go g++
-RUN mkdir -p /go/src/github.com/chrislusf/
-RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs
-RUN cd /go/src/github.com/chrislusf/seaweedfs/weed && go install
-
 FROM alpine AS final
 LABEL author="Chris Lu"
-COPY --from=builder /root/go/bin/weed /usr/bin/
+COPY  ./weed /usr/bin/
 RUN mkdir -p /etc/seaweedfs
-COPY --from=builder /go/src/github.com/chrislusf/seaweedfs/docker/filer.toml /etc/seaweedfs/filer.toml
-COPY --from=builder /go/src/github.com/chrislusf/seaweedfs/docker/entrypoint.sh /entrypoint.sh
+COPY ./filer.toml /etc/seaweedfs/filer.toml
+COPY ./entrypoint.sh /entrypoint.sh
 
 # volume server gprc port
 EXPOSE 18080
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
diff --git a/docker/README.md b/docker/README.md
index 1a2833c7e..65241b517 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -25,7 +25,5 @@ docker-compose -f seaweedfs-dev-compose.yml -p seaweedfs up
 
 ```bash
 cd $GOPATH/src/github.com/chrislusf/seaweedfs/docker
-
-docker-compose -f local-dev-compose.yml -p seaweedfs up
-
+make
 ```
-- 
cgit v1.2.3


From c4de81434711c6734d8dacef14ad5dfa45977d70 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Wed, 26 Feb 2020 16:46:29 -0800
Subject: docker: add cluster mode

---
 docker/Makefile                  | 13 +++++++++-
 docker/local-cluster-compose.yml | 53 ++++++++++++++++++++++++++++++++++++++++
 docker/local-dev-compose.yml     | 44 ++++++++++++++-------------------
 docker/seaweedfs-compose.yml     | 32 ++++++++++++------------
 docker/seaweedfs-dev-compose.yml | 28 ++++++++++-----------
 5 files changed, 113 insertions(+), 57 deletions(-)
 create mode 100644 docker/local-cluster-compose.yml

(limited to 'docker')

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
diff --git a/docker/local-cluster-compose.yml b/docker/local-cluster-compose.yml
new file mode 100644
index 000000000..a5bd25fd6
--- /dev/null
+++ b/docker/local-cluster-compose.yml
@@ -0,0 +1,53 @@
+version: '2'
+
+services:
+  master0:
+    image: chrislusf/seaweedfs:local
+    ports:
+      - 9333:9333
+      - 19333:19333
+    command: "master -ip=master0 -port=9333 -peers=master0:9333,master1:9334,master2:9335"
+  master1:
+    image: chrislusf/seaweedfs:local
+    ports:
+      - 9334:9334
+      - 19334:19334
+    command: "master -ip=master1 -port=9334 -peers=master0:9333,master1:9334,master2:9335"
+  master2:
+    image: chrislusf/seaweedfs:local
+    ports:
+      - 9335:9335
+      - 19335:19335
+    command: "master -ip=master2 -port=9335 -peers=master0:9333,master1:9334,master2:9335"
+  volume:
+    image: chrislusf/seaweedfs:local
+    ports:
+      - 8080:8080
+      - 18080:18080
+    command: '-v=2 volume -max=5 -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume'
+    depends_on:
+      - master0
+      - master1
+      - master2
+  filer:
+    image: chrislusf/seaweedfs:local
+    ports:
+      - 8888:8888
+      - 18888:18888
+    command: '-v=4 filer -master="master0:9333,master1:9334,master2:9335"'
+    depends_on:
+      - master0
+      - master1
+      - master2
+      - volume
+  s3:
+    image: chrislusf/seaweedfs:local
+    ports:
+      - 8333:8333
+    command: '-v=4 s3 -filer="filer:8888" -waitForFiler'
+    depends_on:
+      - master0
+      - master1
+      - master2
+      - volume
+      - filer
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
diff --git a/docker/seaweedfs-compose.yml b/docker/seaweedfs-compose.yml
index 7f0cbc6f9..329b6d4e7 100644
--- a/docker/seaweedfs-compose.yml
+++ b/docker/seaweedfs-compose.yml
@@ -4,28 +4,28 @@ services:
   master:
     image: chrislusf/seaweedfs # use a remote image
     ports:
-    - 9333:9333
-    - 19333:19333
+      - 9333:9333
+      - 19333:19333
     command: "master -ip=master"
   volume:
     image: chrislusf/seaweedfs # use a remote image
     ports:
-    - 8080:8080
-    - 18080:18080
+      - 8080:8080
+      - 18080:18080
     command: 'volume -max=15 -mserver="master:9333" -port=8080'
     depends_on:
-    - master
+      - master
   filer:
     image: chrislusf/seaweedfs # use a remote image
     ports:
-    - 8888:8888
-    - 18888:18888
+      - 8888:8888
+      - 18888:18888
     command: 'filer -master="master:9333"'
     tty: true
     stdin_open: true
     depends_on:
-    - master
-    - volume
+      - master
+      - volume
   cronjob:
     image: chrislusf/seaweedfs # use a remote image
     command: 'cronjob'
@@ -34,14 +34,14 @@ services:
       CRON_SCHEDULE: '*/2 * * * * *' # Default: '*/5 * * * * *'
       WEED_MASTER: master:9333 # Default: localhost:9333
     depends_on:
-    - master
-    - volume
+      - master
+      - volume
   s3:
     image: chrislusf/seaweedfs # use a remote image
     ports:
-    - 8333:8333
-    command: 's3 -filer="filer:8888"'
+      - 8333:8333
+    command: 's3 -filer="filer:8888" -waitForFiler'
     depends_on:
-    - master
-    - volume
-    - filer
+      - master
+      - volume
+      - filer
diff --git a/docker/seaweedfs-dev-compose.yml b/docker/seaweedfs-dev-compose.yml
index 765770084..a9e3c9e3d 100644
--- a/docker/seaweedfs-dev-compose.yml
+++ b/docker/seaweedfs-dev-compose.yml
@@ -4,32 +4,32 @@ services:
   master:
     image: chrislusf/seaweedfs:dev # use a remote dev image
     ports:
-    - 9333:9333
-    - 19333:19333
+      - 9333:9333
+      - 19333:19333
     command: "master -ip=master"
   volume:
     image: chrislusf/seaweedfs:dev # use a remote dev image
     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:
     image: chrislusf/seaweedfs:dev # use a remote dev image
     ports:
-    - 8888:8888
-    - 18888:18888
+      - 8888:8888
+      - 18888:18888
     command: '-v=4 filer -master="master:9333"'
     depends_on:
-    - master
-    - volume
+      - master
+      - volume
   s3:
     image: chrislusf/seaweedfs:dev # use a remote dev image
     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 <chris.lu@gmail.com>
Date: Wed, 26 Feb 2020 16:50:40 -0800
Subject: clean up waitForFiler option

---
 docker/local-cluster-compose.yml | 2 +-
 docker/local-dev-compose.yml     | 2 +-
 docker/seaweedfs-compose.yml     | 2 +-
 docker/seaweedfs-dev-compose.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'docker')

diff --git a/docker/local-cluster-compose.yml b/docker/local-cluster-compose.yml
index a5bd25fd6..0b6860fa1 100644
--- a/docker/local-cluster-compose.yml
+++ b/docker/local-cluster-compose.yml
@@ -44,7 +44,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:
       - master0
       - master1
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
diff --git a/docker/seaweedfs-compose.yml b/docker/seaweedfs-compose.yml
index 329b6d4e7..35509c541 100644
--- a/docker/seaweedfs-compose.yml
+++ b/docker/seaweedfs-compose.yml
@@ -40,7 +40,7 @@ services:
     image: chrislusf/seaweedfs # use a remote image
     ports:
       - 8333:8333
-    command: 's3 -filer="filer:8888" -waitForFiler'
+    command: 's3 -filer="filer:8888"'
     depends_on:
       - master
       - volume
diff --git a/docker/seaweedfs-dev-compose.yml b/docker/seaweedfs-dev-compose.yml
index a9e3c9e3d..197510a9f 100644
--- a/docker/seaweedfs-dev-compose.yml
+++ b/docker/seaweedfs-dev-compose.yml
@@ -28,7 +28,7 @@ services:
     image: chrislusf/seaweedfs:dev # use a remote dev image
     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


From 4dec5e0e4ae9da6d7749128a81d7010f7a3cd801 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sun, 1 Mar 2020 18:23:07 -0800
Subject: fix dockerhub build

---
 docker/Dockerfile.go_build | 12 +++++++++---
 docker/Dockerfile.local    | 29 +++++++++++++++++++++++++++++
 docker/Makefile            |  2 +-
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 docker/Dockerfile.local

(limited to 'docker')

diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build
index b4a7b6504..306ce3aa1 100644
--- a/docker/Dockerfile.go_build
+++ b/docker/Dockerfile.go_build
@@ -1,9 +1,15 @@
+FROM frolvlad/alpine-glibc as builder
+RUN apk add git go g++
+RUN mkdir -p /go/src/github.com/chrislusf/
+RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs
+RUN cd /go/src/github.com/chrislusf/seaweedfs/weed && go install
+
 FROM alpine AS final
 LABEL author="Chris Lu"
-COPY  ./weed /usr/bin/
+COPY --from=builder /root/go/bin/weed /usr/bin/
 RUN mkdir -p /etc/seaweedfs
-COPY ./filer.toml /etc/seaweedfs/filer.toml
-COPY ./entrypoint.sh /entrypoint.sh
+COPY --from=builder /go/src/github.com/chrislusf/seaweedfs/docker/filer.toml /etc/seaweedfs/filer.toml
+COPY --from=builder /go/src/github.com/chrislusf/seaweedfs/docker/entrypoint.sh /entrypoint.sh
 
 # volume server gprc port
 EXPOSE 18080
diff --git a/docker/Dockerfile.local b/docker/Dockerfile.local
new file mode 100644
index 000000000..b4a7b6504
--- /dev/null
+++ b/docker/Dockerfile.local
@@ -0,0 +1,29 @@
+FROM alpine AS final
+LABEL author="Chris Lu"
+COPY  ./weed /usr/bin/
+RUN mkdir -p /etc/seaweedfs
+COPY ./filer.toml /etc/seaweedfs/filer.toml
+COPY ./entrypoint.sh /entrypoint.sh
+
+# volume server gprc port
+EXPOSE 18080
+# volume server http port
+EXPOSE 8080
+# filer server gprc port
+EXPOSE 18888
+# filer server http port
+EXPOSE 8888
+# master server shared gprc port
+EXPOSE 19333
+# master server shared http port
+EXPOSE 9333
+# s3 server http port
+EXPOSE 8333
+
+RUN mkdir -p /data/filerldb2
+
+VOLUME /data
+
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
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


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: 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(-)

(limited to 'docker')

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
-- 
cgit v1.2.3


From 5c5ddc740dc224cfecb4107d6b728ed70fbcf4a3 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Wed, 25 Mar 2020 14:39:43 -0700
Subject: docker: entrypoint skip ip address detection

---
 docker/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docker')

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 7ce0fde8d..b9202d4d3 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -13,7 +13,7 @@ case "$1" in
 	;;
 
   'server')
-  	ARGS="-ip=`hostname -i` -dir=/data -volume.max=0 -master.volumePreallocate -master.volumeSizeLimitMB=1024"
+  	ARGS="-dir=/data -volume.max=0 -master.volumePreallocate -master.volumeSizeLimitMB=1024"
   	exec /usr/bin/weed $@ $ARGS
   	;;
 
-- 
cgit v1.2.3


From d4db0db220fcdeb62f1cbec9591e8e48e6d21f81 Mon Sep 17 00:00:00 2001
From: nevermore1000 <359447701@qq.com>
Date: Wed, 13 May 2020 19:16:03 +0800
Subject: some typos

---
 docker/Dockerfile.local | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile.local b/docker/Dockerfile.local
index b4a7b6504..693d8a952 100644
--- a/docker/Dockerfile.local
+++ b/docker/Dockerfile.local
@@ -5,15 +5,15 @@ RUN mkdir -p /etc/seaweedfs
 COPY ./filer.toml /etc/seaweedfs/filer.toml
 COPY ./entrypoint.sh /entrypoint.sh
 
-# volume server gprc port
+# volume server grpc port
 EXPOSE 18080
 # volume server http port
 EXPOSE 8080
-# filer server gprc port
+# filer server grpc port
 EXPOSE 18888
 # filer server http port
 EXPOSE 8888
-# master server shared gprc port
+# master server shared grpc port
 EXPOSE 19333
 # master server shared http port
 EXPOSE 9333
-- 
cgit v1.2.3


From 232b0f0e6e6f12b05f0eb6e1a205bd99818fcbf0 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Thu, 21 May 2020 22:19:06 -0700
Subject: allow overwrite flags

---
 docker/entrypoint.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docker')

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index b9202d4d3..3c9df6402 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -4,27 +4,27 @@ case "$1" in
 
   'master')
   	ARGS="-mdir=/data -volumePreallocate -volumeSizeLimitMB=1024"
-  	exec /usr/bin/weed $@ $ARGS
+  	exec /usr/bin/weed $ARGS $@
 	;;
 
   'volume')
   	ARGS="-dir=/data -max=0"
-  	exec /usr/bin/weed $@ $ARGS
+  	exec /usr/bin/weed $ARGS $@
 	;;
 
   'server')
   	ARGS="-dir=/data -volume.max=0 -master.volumePreallocate -master.volumeSizeLimitMB=1024"
-  	exec /usr/bin/weed $@ $ARGS
+  	exec /usr/bin/weed $ARGS $@
   	;;
 
   'filer')
   	ARGS=""
-  	exec /usr/bin/weed $@ $ARGS
+  	exec /usr/bin/weed $ARGS $@
 	;;
 
   's3')
   	ARGS="-domainName=$S3_DOMAIN_NAME -key.file=$S3_KEY_FILE -cert.file=$S3_CERT_FILE"
-  	exec /usr/bin/weed $@ $ARGS
+  	exec /usr/bin/weed $ARGS $@
 	;;
 
   'cronjob')
-- 
cgit v1.2.3


From 1e64dbcb98523530a340abbd35c3d641242b2683 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Fri, 22 May 2020 10:30:46 -0700
Subject: Revert "allow overwrite flags"

This reverts commit 232b0f0e
---
 docker/entrypoint.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'docker')

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 3c9df6402..b9202d4d3 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -4,27 +4,27 @@ case "$1" in
 
   'master')
   	ARGS="-mdir=/data -volumePreallocate -volumeSizeLimitMB=1024"
-  	exec /usr/bin/weed $ARGS $@
+  	exec /usr/bin/weed $@ $ARGS
 	;;
 
   'volume')
   	ARGS="-dir=/data -max=0"
-  	exec /usr/bin/weed $ARGS $@
+  	exec /usr/bin/weed $@ $ARGS
 	;;
 
   'server')
   	ARGS="-dir=/data -volume.max=0 -master.volumePreallocate -master.volumeSizeLimitMB=1024"
-  	exec /usr/bin/weed $ARGS $@
+  	exec /usr/bin/weed $@ $ARGS
   	;;
 
   'filer')
   	ARGS=""
-  	exec /usr/bin/weed $ARGS $@
+  	exec /usr/bin/weed $@ $ARGS
 	;;
 
   's3')
   	ARGS="-domainName=$S3_DOMAIN_NAME -key.file=$S3_KEY_FILE -cert.file=$S3_CERT_FILE"
-  	exec /usr/bin/weed $ARGS $@
+  	exec /usr/bin/weed $@ $ARGS
 	;;
 
   'cronjob')
-- 
cgit v1.2.3


From ab4c9ac22104b1bf0df53f2c8b46d80e3f143665 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Fri, 22 May 2020 10:37:04 -0700
Subject: allow optionally change volume max count

---
 docker/entrypoint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docker')

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index b9202d4d3..05db7a672 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -9,11 +9,17 @@ case "$1" in
 
   'volume')
   	ARGS="-dir=/data -max=0"
+  	if [[ $@ == *"-max="* ]]; then
+  	  ARGS="-dir=/data"
+  	fi
   	exec /usr/bin/weed $@ $ARGS
 	;;
 
   'server')
   	ARGS="-dir=/data -volume.max=0 -master.volumePreallocate -master.volumeSizeLimitMB=1024"
+  	if [[ $@ == *"-volume.max="* ]]; then
+  	  ARGS="-dir=/data -master.volumePreallocate -master.volumeSizeLimitMB=1024"
+  	fi
   	exec /usr/bin/weed $@ $ARGS
   	;;
 
-- 
cgit v1.2.3