Merge pull request #729 from hans-strudle/master

Add filer to docker-compose and entrypoint and build from local Dockerfile

docker/Dockerfile

@@ -8,10 +8,12 @@ RUN apk add --no-cache --virtual build-dependencies --update wget curl ca-certif
     rm -rf /tmp/*
 
 EXPOSE 8080
+EXPOSE 8888
 EXPOSE 9333
 
 VOLUME /data
 
+COPY filer.toml /etc/seaweedfs/filer.toml
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 

docker/docker-compose.yml

@@ -2,7 +2,8 @@ version: '2'
 
 services:
   master:
-    image: chrislusf/seaweedfs
+    #image: chrislusf/seaweedfs # use a remote image
+    build: . # build our container from the local Dockerfile
     ports:
       - 9333:9333
     command: "master"
@@ -11,7 +12,8 @@ services:
         aliases:
           - seaweed_master
   volume:
-    image: chrislusf/seaweedfs
+    #image: chrislusf/seaweedfs # use a remote image
+    build: . # build our container from the local Dockerfile
     ports:
       - 8080:8080
     command: 'volume -max=5 -mserver="master:9333" -port=8080'
@@ -21,3 +23,16 @@ services:
       default:
         aliases:
           - seaweed_volume
+  filer:
+    #image: chrislusf/seaweedfs # use a remote image
+    build: . # build our container from the local Dockerfile
+    ports: 
+      - 8888:8888
+    command: 'filer -master="master:9333"'
+    depends_on:
+      - master
+      - volume 
+    networks:
+      default:
+        aliases:
+          - seaweed_filer

docker/entrypoint.sh

@@ -28,6 +28,14 @@ case "$1" in
   	exec /usr/bin/weed $@ $ARGS
   	;;
 
+  'filer')
+  	ARGS="-ip `hostname -i`"
+  	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
+	;;
+
   *)
   	exec /usr/bin/weed $@
 	;;

docker/filer.toml

@@ -0,0 +1,3 @@
+[leveldb]
+enabled = true
+dir = "."