github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-21 05:43:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'dev' into edge

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-26 12:22:20 -07:00
commit ea65386e15
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
3 changed files with 100 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
attic/make-linux.mk
View file

@ -339,7 +339,7 @@ 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
central-controller-docker: central-controller
docker build -t docker.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} -f docker/Dockerfile .
docker build -t docker.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} -f ext/central-controller-docker/Dockerfile .
debug: FORCE
make ZT_DEBUG=1 one