diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-10-25 12:43:35 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-10-25 12:43:35 -0700 |
| commit | 96e1df58540fcec2f251a9cb9ab0550e4c6563ba (patch) | |
| tree | f826bd2e3698d2d836beba1723ca809bd5578424 /docker | |
| parent | 2e44b90f633acfa0fbcf262a99f9690fec2d3e3f (diff) | |
| parent | 5a0adba798effa9690160bc11658abb50b38805d (diff) | |
| download | infinitytier-96e1df58540fcec2f251a9cb9ab0550e4c6563ba.tar.gz infinitytier-96e1df58540fcec2f251a9cb9ab0550e4c6563ba.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/main.sh | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 3b01b2ad..ec903191 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,6 +6,10 @@ RUN yum update -y RUN yum install -y https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-7-x86_64/pgdg-centos10-10-2.noarch.rpm RUN yum install -y postgresql10 +RUN yum -y install epel-release && yum -y update && yum clean all +RUN yum -y install clang jemalloc jemalloc-devel + + ADD zerotier-one /usr/local/bin/zerotier-one RUN chmod a+x /usr/local/bin/zerotier-one diff --git a/docker/main.sh b/docker/main.sh index f0054a94..e96978f3 100644 --- a/docker/main.sh +++ b/docker/main.sh @@ -41,4 +41,7 @@ echo "{ } " > /var/lib/zerotier-one/local.conf +export GLIBCXX_FORCE_NEW=1 +export GLIBCPP_FORCE_NEW=1 +export LD_PRELOAD="/usr/lib64/libjemalloc.so" exec /usr/local/bin/zerotier-one /var/lib/zerotier-one |