diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2016-10-12 21:18:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 21:18:51 -0700 |
| commit | 88d0df523e131d22786772bcd28937c9e264aac0 (patch) | |
| tree | b669d8974bcfbf327a22ce0e8de21361fee87828 | |
| parent | 79fdea0de4176dc44b3728987c0aa4b33b725503 (diff) | |
| parent | 54bd1c406a70fab3f71332511897460fed32e568 (diff) | |
| download | seaweedfs-88d0df523e131d22786772bcd28937c9e264aac0.tar.xz seaweedfs-88d0df523e131d22786772bcd28937c9e264aac0.zip | |
Merge pull request #378 from amincheloh/patch-1
Update Dockerfile and entrypoint.sh
| -rw-r--r-- | docker/Dockerfile | 6 | ||||
| -rwxr-xr-x | docker/entrypoint.sh | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index ed1c4dfe3..21e5a7b47 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,5 @@ FROM progrium/busybox -COPY entrypoint.sh /entrypoint.sh -COPY Dockerfile /etc/Dockerfile - RUN opkg-install curl RUN echo tlsv1 >> ~/.curlrc @@ -15,4 +12,7 @@ EXPOSE 9333 VOLUME /data +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index bdde2caa4..34ab61148 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -8,7 +8,7 @@ case "$1" in if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then ARGS="$ARGS -peers=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT" fi - /usr/bin/weed $@ $ARGS + exec /usr/bin/weed $@ $ARGS ;; 'volume') @@ -17,7 +17,7 @@ case "$1" in if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then ARGS="$ARGS -mserver=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT" fi - /usr/bin/weed $@ $ARGS + exec /usr/bin/weed $@ $ARGS ;; 'server') @@ -25,10 +25,10 @@ case "$1" in if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then ARGS="$ARGS -master.peers=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT" fi - /usr/bin/weed $@ $ARGS + exec /usr/bin/weed $@ $ARGS ;; *) - /usr/bin/weed $@ + exec /usr/bin/weed $@ ;; -esac +esac |