Merge branch 'dev' into central-controller

.github/workflows/badstrings.yml

@@ -0,0 +1,17 @@
+name: badstrings
+on: [pull_request, push]
+jobs:
+  badstrings:
+    runs-on: ubuntu-latest
+    steps:
+      - name: scanning commit message for bad strings
+        run: |
+          #!/bin/bash
+          set -euo pipefail
+          IFS=$'\n\t'
+          message="${{ github.event.head_commit.message }}"
+          
+          strings=($(curl -s https://raw.githubusercontent.com/someara/badstrings/main/strings.txt))
+          for i in ${strings[@]} ; do
+            echo "${message}" | grep -v "$i" &>/dev/null;
+          done

Dockerfile.ci

@@ -0,0 +1,28 @@
+# vim: ft=dockerfile
+
+FROM ubuntu:21.04 as stage
+
+RUN apt-get update -qq && apt-get -qq install make clang
+COPY . .
+RUN /usr/bin/make
+RUN echo $PWD
+RUN cp zerotier-one /usr/sbin
+
+FROM ubuntu:21.04
+
+COPY --from=stage /zerotier-one /usr/sbin
+RUN ln -sf /usr/sbin/zerotier-one /usr/sbin/zerotier-idtool
+RUN ln -sf /usr/sbin/zerotier-one /usr/sbin/zerotier-cli
+
+RUN echo "${VERSION}" > /etc/zerotier-version
+RUN rm -rf /var/lib/zerotier-one
+
+
+RUN apt-get -qq update
+RUN apt-get -qq install iproute2 net-tools fping 2ping iputils-ping iputils-arping
+
+COPY entrypoint.sh.release /entrypoint.sh
+RUN chmod 755 /entrypoint.sh
+
+CMD []
+ENTRYPOINT ["/entrypoint.sh"]

debian/changelog

@@ -1,8 +1,8 @@
-zerotier-one (1.7.1) unstable; urgency=medium
+zerotier-one (1.8.0) unstable; urgency=medium
 
-  * Version 1.8.0 PRE-release, beta testing.
+  * See RELEASE-NOTES.md for release notes.
 
- -- Adam Ierymenko <[email protected]>  Tue, 23 Aug 2021 01:00:00 -0700
+ -- Adam Ierymenko <[email protected]>  Wed, 15 Sep 2021 01:00:00 -0700
 
 zerotier-one (1.6.5) unstable; urgency=medium
 

ext/installfiles/mac/ZeroTier One.pkgproj

@@ -701,7 +701,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.7.2</string>
+				<string>1.8.0</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>