Merge from 'master'

This commit is contained in:
Minio Trusted
2017-05-04 17:54:34 -07:00
760 changed files with 160717 additions and 10819 deletions

View File

@@ -15,5 +15,13 @@ RUN \
rm -rf /go/pkg /go/src /usr/local/go && apk del .build-deps
EXPOSE 9000
ENTRYPOINT ["minio"]
COPY buildscripts/docker-entrypoint.sh /usr/bin/
RUN chmod +x /usr/bin/docker-entrypoint.sh
ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
VOLUME ["/export"]
CMD ["minio"]