diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-06-20 15:20:46 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-06-20 15:20:46 -0700 |
| commit | 554e0b7c6de6eb0a3c1014b0bbfb5b967d427ed8 (patch) | |
| tree | 4299b1609a8121cba3d5390300db2df44754413a | |
| parent | fd74e2a5838c596425369d08a707a1bac7516f69 (diff) | |
| parent | af5d3a7f0bdc76d6fc4387c4fef8aaaa78977915 (diff) | |
| download | infinitytier-554e0b7c6de6eb0a3c1014b0bbfb5b967d427ed8.tar.gz infinitytier-554e0b7c6de6eb0a3c1014b0bbfb5b967d427ed8.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/main.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index f13a2bc6..0f0750c6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Adam Ierymekno <adam.ierymenko@zerotier.com>, 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 diff --git a/docker/main.sh b/docker/main.sh index eaad951c..b8d3b142 100644 --- a/docker/main.sh +++ b/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' |