From 68028ee87673a5ba5d386bb278e549d37ddcaf5d Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Thu, 27 Dec 2018 15:13:58 -0800
Subject: [PATCH] clean up
---
docker/README.md | 2 +-
docker/docker-compose.yml | 20 +++-----------------
docker/entrypoint.sh | 3 +--
3 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/docker/README.md b/docker/README.md
index 31d88a3de..54db588f2 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -5,7 +5,7 @@
```bash
-wget https://github.com/chrislusf/seaweedfs/blob/master/docker/docker-compose.yml
+wget https://raw.githubusercontent.com/chrislusf/seaweedfs/master/docker/docker-compose.yml
docker-compose -f docker-compose.yml up
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 054f0faa6..b5105adea 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -6,35 +6,25 @@ services:
ports:
- 9333:9333
command: "master"
- networks:
- default:
- aliases:
- - seaweed_master
volume:
image: chrislusf/seaweedfs # use a remote image
ports:
- 8080:8080
- 18080:18080
- command: 'volume -max=5 -mserver="master:9333" -port=8080'
+ command: 'volume -max=15 -mserver="master:9333" -port=8080'
depends_on:
- master
- networks:
- default:
- aliases:
- - seaweed_volume
filer:
image: chrislusf/seaweedfs # use a remote image
ports:
- 8888:8888
- 18888:18888
command: 'filer -master="master:9333"'
+ tty: true
+ stdin_open: true
depends_on:
- master
- volume
- networks:
- default:
- aliases:
- - seaweed_filer
s3:
image: chrislusf/seaweedfs # use a remote image
ports:
@@ -44,7 +34,3 @@ services:
- master
- volume
- filer
- networks:
- default:
- aliases:
- - seaweed_s3
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 084c7cd6d..1c47c57f2 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -29,12 +29,11 @@ case "$1" in
;;
'filer')
- exec /bin/mkdir -p /data/filerdb
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 /bin/mkdir -p /data/filerdb; /usr/bin/weed $@ $ARGS
;;
's3')