# HG changeset patch # User Chaiwat Suttipongsakul # Date 1462964453 -25200 # Wed May 11 18:00:53 2016 +0700 # Node ID 9860c3f18eda84948ef7435f283be49488a92993 # Parent 4c5d112821d14eaa79e998f5138018fb5a5bd716 Change Docker base image to photon - Bundle uvloop along with wormhole for higher performance. - Bump version to 2.0.1. diff --git a/docker/Dockerfile b/docker/Dockerfile --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,23 @@ # wormhole proxy -FROM bashell/alpine-bash:latest +FROM photon:latest MAINTAINER Chaiwat Suttipongsakul "cwt@bashell.com" -RUN apk update && apk upgrade && apk add python3 && \ - cd / && pyvenv wormhole && /wormhole/bin/pip install \ - https://bitbucket.org/bashell-com/wormhole/get/default.tar.gz?`date | md5sum |cut -b -32` +RUN tdnf update -y && tdnf clean all +RUN tdnf install -y python3 python3-libs python3-tools python3-devel && tdnf clean all +RUN tdnf install -y autoconf automake binutils flex gawk gcc gdbm glibc-devel \ + libgcc-devel libgomp libgomp-devel libstdc++-devel libtool \ + linux-api-headers m4 make mpc mpfr perl sed && tdnf clean all && \ + pip3.5 install virtualenv && cd / && virtualenv wormhole && \ + /wormhole/bin/pip install cython && \ + /wormhole/bin/pip install uvloop && \ + /wormhole/bin/pip install wormhole-proxy && \ + tdnf remove -y autoconf automake binutils flex gawk gcc gdbm glibc-devel \ + libgcc-devel libgomp libgomp-devel libstdc++-devel libtool \ + linux-api-headers m4 make mpc mpfr perl sed && tdnf clean all && \ + rm -rf /root/.cache && \ + for cache in `find /wormhole -iname '__pycache__'`; do rm -rf $cache; done + ADD wormhole-forever.sh /wormhole/bin/ EXPOSE 8800/tcp diff --git a/docker/wormhole-forever.sh b/docker/wormhole-forever.sh --- a/docker/wormhole-forever.sh +++ b/docker/wormhole-forever.sh @@ -1,5 +1,5 @@ #!/bin/bash - +ulimit -n 8192 # Showing help or license then exit normally. if [ "$1" = "-h" ] || [ "$1" = "--help" ] \ || [ "$1" = "-l" ] || [ "$1" = "--license" ]; then diff --git a/wormhole/proxy.py b/wormhole/proxy.py --- a/wormhole/proxy.py +++ b/wormhole/proxy.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -VERSION = "v2.0" +VERSION = "v2.0.1" import sys if sys.version_info < (3, 5):