From bc025d53055066d20ee6cf02ff4d7a30527831fe Mon Sep 17 00:00:00 2001 From: "jenkins.ow" Date: Tue, 11 Sep 2018 12:36:59 -0700 Subject: [PATCH 1/4] add filer to docker-compose and entrypoint, build from local Dockerfile --- docker/Dockerfile | 2 ++ docker/docker-compose.yml | 18 +++++++++++++++--- docker/entrypoint.sh | 8 ++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7420be8bb..9b8c44760 100644 --- a/docker/Dockerfile +++ b/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 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 3ccf596d5..48c576a6f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: master: - image: chrislusf/seaweedfs + build: . ports: - 9333:9333 command: "master" @@ -11,7 +11,7 @@ services: aliases: - seaweed_master volume: - image: chrislusf/seaweedfs + build: . ports: - 8080:8080 command: 'volume -max=5 -mserver="master:9333" -port=8080' @@ -20,4 +20,16 @@ services: networks: default: aliases: - - seaweed_volume \ No newline at end of file + - seaweed_volume + filer: + build: . + ports: + - 8888:8888 + command: 'filer -master="master:9333"' + depends_on: + - master + - volume + networks: + default: + aliases: + - seaweed_filer diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 34ab61148..6fd97ad9b 100755 --- a/docker/entrypoint.sh +++ b/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 $@ ;; From bb7e165ce81ff44370cdb23c133c86023c2c857e Mon Sep 17 00:00:00 2001 From: "jenkins.ow" Date: Tue, 11 Sep 2018 12:38:38 -0700 Subject: [PATCH 2/4] add filer.toml --- docker/filer.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docker/filer.toml diff --git a/docker/filer.toml b/docker/filer.toml new file mode 100644 index 000000000..21db9c772 --- /dev/null +++ b/docker/filer.toml @@ -0,0 +1,3 @@ +[memory] +enabled = true +dir = "." From 2bd2959ac35da4113c7e4538b13a72b76e5d194b Mon Sep 17 00:00:00 2001 From: Author Name Date: Tue, 11 Sep 2018 12:38:38 -0700 Subject: [PATCH 3/4] add filer.toml --- docker/filer.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docker/filer.toml diff --git a/docker/filer.toml b/docker/filer.toml new file mode 100644 index 000000000..21db9c772 --- /dev/null +++ b/docker/filer.toml @@ -0,0 +1,3 @@ +[memory] +enabled = true +dir = "." From bcd06304cc38b12ff9a275d300396800546e7df5 Mon Sep 17 00:00:00 2001 From: hans-strudle Date: Tue, 11 Sep 2018 16:05:27 -0700 Subject: [PATCH 4/4] changed filer.toml to leveldb, added comments in docker-compose --- docker/docker-compose.yml | 9 ++++++--- docker/filer.toml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 48c576a6f..6d6e9b140 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,8 @@ version: '2' services: master: - build: . + #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: - build: . + #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' @@ -22,7 +24,8 @@ services: aliases: - seaweed_volume filer: - build: . + #image: chrislusf/seaweedfs # use a remote image + build: . # build our container from the local Dockerfile ports: - 8888:8888 command: 'filer -master="master:9333"' diff --git a/docker/filer.toml b/docker/filer.toml index 21db9c772..35db3d012 100644 --- a/docker/filer.toml +++ b/docker/filer.toml @@ -1,3 +1,3 @@ -[memory] +[leveldb] enabled = true dir = "."