ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-31 22:40:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Un-log & some production build image fixes

Browse Source
This commit is contained in:
Grant Limberg 2020-02-24 11:02:05 -08:00
parent baa14a63c9
commit 12a92fc4a1
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controller/PostgreSQL.cpp
View File

@ -1017,10 +1017,6 @@ void PostgreSQL::commitThread()
get(nwidInt, nwOrig, memberidInt, memOrig); get(nwidInt, nwOrig, memberidInt, memOrig);
if(memOrig["authorized"] && ! (*config)["authorized"]) {
fprintf(stderr, "Member %s deauthed\n", (*config)["id"].get<std::string>().c_str());
}
_memberChanged(memOrig, memNew, qitem.second); _memberChanged(memOrig, memNew, qitem.second);
} else { } else {
fprintf(stderr, "Can't notify of change. Error parsing nwid or memberid: %llu-%llu\n", (unsigned long long)nwidInt, (unsigned long long)memberidInt); fprintf(stderr, "Can't notify of change. Error parsing nwid or memberid: %llu-%llu\n", (unsigned long long)nwidInt, (unsigned long long)memberidInt);

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

@ -16,6 +16,8 @@ RUN ldconfig
RUN cd ZeroTierOne && make central-controller RUN cd ZeroTierOne && make central-controller
FROM centos:7 FROM centos:7
RUN yum install -y https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-7-x86_64/pgdg-centos10-10-2.noarch.rpm && yum -y install epel-release && yum -y update && yum clean all
RUN yum install -y jemalloc jemalloc-devel postgresql10
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

@ -329,7 +329,7 @@ official: FORCE
make -j4 ZT_OFFICIAL=1 all make -j4 ZT_OFFICIAL=1 all
docker: FORCE docker: FORCE
docker build -f ext/installfiles/linux/zerotier-containerized/Dockerfile -t zerotier-containerized . docker build --no-cache -f ext/installfiles/linux/zerotier-containerized/Dockerfile -t zerotier-containerized .
central-controller: FORCE central-controller: FORCE
make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq -Lext/librabbitmq/centos_x64/lib/ -lrabbitmq" CXXFLAGS="-I/usr/pgsql-10/include -I./ext/librabbitmq/centos_x64/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq -Lext/librabbitmq/centos_x64/lib/ -lrabbitmq" CXXFLAGS="-I/usr/pgsql-10/include -I./ext/librabbitmq/centos_x64/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one