gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #378 from amincheloh/patch-1

Browse Source 
Update Dockerfile and entrypoint.sh
This commit is contained in:
Chris Lu
2016-10-12 21:18:51 -07:00
committed by GitHub
parent 79fdea0de4 54bd1c406a
commit 88d0df523e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/Dockerfile
View File

@@ -1,8 +1,5 @@
FROM progrium/busybox FROM progrium/busybox
COPY entrypoint.sh /entrypoint.sh
COPY Dockerfile /etc/Dockerfile
RUN opkg-install curl RUN opkg-install curl
RUN echo tlsv1 >> ~/.curlrc RUN echo tlsv1 >> ~/.curlrc
@@ -15,4 +12,7 @@ EXPOSE 9333
VOLUME /data VOLUME /data
COPY entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]

10
docker/entrypoint.sh
View File

@@ -8,7 +8,7 @@ case "$1" in
if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then
ARGS="$ARGS -peers=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT" ARGS="$ARGS -peers=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT"
fi fi
/usr/bin/weed $@ $ARGS exec /usr/bin/weed $@ $ARGS
;; ;;
'volume') 'volume')
@@ -17,7 +17,7 @@ case "$1" in
if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then
ARGS="$ARGS -mserver=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT" ARGS="$ARGS -mserver=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT"
fi fi
/usr/bin/weed $@ $ARGS exec /usr/bin/weed $@ $ARGS
;; ;;
'server') 'server')
@@ -25,10 +25,10 @@ case "$1" in
if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then if [ -n "$MASTER_PORT_9333_TCP_ADDR" ] ; then
ARGS="$ARGS -master.peers=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT" ARGS="$ARGS -master.peers=$MASTER_PORT_9333_TCP_ADDR:$MASTER_PORT_9333_TCP_PORT"
fi fi
/usr/bin/weed $@ $ARGS exec /usr/bin/weed $@ $ARGS
;; ;;
*) *)
/usr/bin/weed $@ exec /usr/bin/weed $@
;; ;;
esac esac