ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-07 11:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux docker build

Browse Source
This commit is contained in:
Grant Limberg 2021-06-03 18:30:32 -07:00
parent 4f521baafd
commit 6cb4c58d9a
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controller/PostgreSQL.cpp
View File

@ -991,7 +991,7 @@ void PostgreSQL::commitThread()
(bool)(*config)["activeBridge"], (bool)(*config)["activeBridge"],
(bool)(*config)["authorized"], (bool)(*config)["authorized"],
OSUtils::jsonDump((*config)["capabilities"], -1), OSUtils::jsonDump((*config)["capabilities"], -1),
(std::string)(*config)["identity"], OSUtils::jsonString((*config)["identity"], ""),
(uint64_t)(*config)["lastAuthorizedTime"], (uint64_t)(*config)["lastAuthorizedTime"],
(uint64_t)(*config)["lastDeauthorizedTime"], (uint64_t)(*config)["lastDeauthorizedTime"],
(bool)(*config)["noAutoAssignIps"], (bool)(*config)["noAutoAssignIps"],
@ -1097,7 +1097,7 @@ void PostgreSQL::commitThread()
OSUtils::now(), OSUtils::now(),
(int)(*config)["mtu"], (int)(*config)["mtu"],
(int)(*config)["multicastLimit"], (int)(*config)["multicastLimit"],
(std::string)(*config)["name"], OSUtils::jsonString((*config)["name"],""),
(bool)(*config)["private"], (bool)(*config)["private"],
(int)(*config)["remoteTraceLevel"], (int)(*config)["remoteTraceLevel"],
remoteTraceTarget, remoteTraceTarget,

12
ext/central-controller-docker/Dockerfile
View File

@ -9,7 +9,15 @@ RUN yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x
RUN dnf -qy module disable postgresql RUN dnf -qy module disable postgresql
RUN yum -y install epel-release && yum -y update && yum clean all RUN yum -y install epel-release && yum -y update && yum clean all
RUN yum groupinstall -y "Development Tools" RUN yum groupinstall -y "Development Tools"
RUN yum install -y bash postgresql10 postgresql10-devel libpqxx-devel clang jemalloc jemalloc-devel RUN yum install -y bash cmake postgresql10 postgresql10-devel clang jemalloc jemalloc-devel
RUN curl -sL https://github.com/jtv/libpqxx/archive/refs/tags/6.4.5.tar.gz -o libpqxx.tar.gz
RUN tar -xzf libpqxx.tar.gz && \
pushd libpqxx-6.4.5/ && \
mkdir build && pushd build/ && \
cmake .. && \
make install && \
popd && popd
# RUN git clone http://git.int.zerotier.com/zerotier/ZeroTierOne.git # RUN git clone http://git.int.zerotier.com/zerotier/ZeroTierOne.git
# RUN if [ "$git_branch" != "master" ]; then cd ZeroTierOne && git checkout -b $git_branch origin/$git_branch; fi # RUN if [ "$git_branch" != "master" ]; then cd ZeroTierOne && git checkout -b $git_branch origin/$git_branch; fi
@ -22,6 +30,8 @@ RUN dnf -qy module disable postgresql
RUN yum -y install epel-release && yum -y update && yum clean all RUN yum -y install epel-release && yum -y update && yum clean all
RUN yum install -y jemalloc jemalloc-devel postgresql10 RUN yum install -y jemalloc jemalloc-devel postgresql10
COPY --from=builder /usr/local/lib64/libpqxx.so /usr/local/lib64/libpqxx.so
COPY --from=builder /usr/local/lib64/libpqxx.a /usr/local/lib64/libpqxx.a
COPY --from=builder /ZeroTierOne/zerotier-one /usr/local/bin/zerotier-one COPY --from=builder /ZeroTierOne/zerotier-one /usr/local/bin/zerotier-one
RUN chmod a+x /usr/local/bin/zerotier-one RUN chmod a+x /usr/local/bin/zerotier-one

2
make-linux.mk
View File

@ -266,7 +266,7 @@ ifeq ($(ZT_OFFICIAL),1)
endif endif
ifeq ($(ZT_CONTROLLER),1) ifeq ($(ZT_CONTROLLER),1)
override LDLIBS+=-L/usr/pgsql-10/lib/ -lpq ext/hiredis-0.14.1/lib/centos8/libhiredis.a ext/redis-plus-plus-1.1.1/install/centos8/lib/libredis++.a override LDLIBS+=-L/usr/pgsql-10/lib/ -lpqxx -lpq ext/hiredis-0.14.1/lib/centos8/libhiredis.a ext/redis-plus-plus-1.1.1/install/centos8/lib/libredis++.a
override DEFS+=-DZT_CONTROLLER_USE_LIBPQ override DEFS+=-DZT_CONTROLLER_USE_LIBPQ
override INCLUDES+=-I/usr/pgsql-10/include -Iext/hiredis-0.14.1/include/ -Iext/redis-plus-plus-1.1.1/install/centos8/include/sw/ override INCLUDES+=-I/usr/pgsql-10/include -Iext/hiredis-0.14.1/include/ -Iext/redis-plus-plus-1.1.1/install/centos8/include/sw/
endif endif