瀏覽代碼

Un-log & some production build image fixes

Grant Limberg 5 年之前
父節點
當前提交
12a92fc4a1
共有 3 個文件被更改,包括 3 次插入5 次删除
  1. 0 4
      controller/PostgreSQL.cpp
  2. 2 0
      ext/central-controller-docker/Dockerfile
  3. 1 1
      make-linux.mk

+ 0 - 4
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<std::string>().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);

+ 2 - 0
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

+ 1 - 1
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