Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

docker/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Adam Ierymekno <[email protected]>, Grant Limberg <grant.li
 
 RUN yum update -y
 RUN yum install -y https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-7-x86_64/pgdg-centos10-10-2.noarch.rpm
-RUN yum install -y postgresql10 libpqxx-devel
+RUN yum install -y bash postgresql10 libpqxx-devel
 
 RUN yum -y install epel-release && yum -y update && yum clean all
 RUN yum -y install clang jemalloc jemalloc-devel

docker/main.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 if [ -z "$ZT_IDENTITY_PATH" ]; then
     echo '*** FAILED: ZT_IDENTITY_PATH environment variable is not defined'