diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp index d1f8ef218..8f8c2785a 100644 --- a/controller/PostgreSQL.cpp +++ b/controller/PostgreSQL.cpp @@ -1017,10 +1017,6 @@ void PostgreSQL::commitThread() get(nwidInt, nwOrig, memberidInt, memOrig); - if(memOrig["authorized"] && ! (*config)["authorized"]) { - fprintf(stderr, "Member %s deauthed\n", (*config)["id"].get().c_str()); - } - _memberChanged(memOrig, memNew, qitem.second); } else { fprintf(stderr, "Can't notify of change. Error parsing nwid or memberid: %llu-%llu\n", (unsigned long long)nwidInt, (unsigned long long)memberidInt); diff --git a/ext/central-controller-docker/Dockerfile b/ext/central-controller-docker/Dockerfile index 716390f82..8ded3e64a 100644 --- a/ext/central-controller-docker/Dockerfile +++ b/ext/central-controller-docker/Dockerfile @@ -16,6 +16,8 @@ RUN ldconfig RUN cd ZeroTierOne && make central-controller 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 RUN chmod a+x /usr/local/bin/zerotier-one diff --git a/make-linux.mk b/make-linux.mk index 8b63d7998..de96f2290 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -329,7 +329,7 @@ official: FORCE make -j4 ZT_OFFICIAL=1 all 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 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