self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 10:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1568 from gravitational/roman/dockerpro

Browse source 
Allow to pick pro or enterprise mode in docker flow
This commit is contained in:
Roman Tkachenko 2018-01-09 18:44:42 -08:00 committed by GitHub
parent 2bb2f87061 85efd6f6ed
commit 4a5fba0767
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
docker/Makefile
View file

@ -1,3 +1,10 @@
# location of the test enterprise license file
ENTERPRISE_LICENSE ?= ../e/fixtures/license-enterprise.pem
# location of the test pro license file
PRO_LICENSE ?= ../e/fixtures/license-pro.pem
# whether to look for enterprise or pro license
MODE ?= enterprise
#
# Default target starts two Teleport clusters
#
@ -53,14 +60,15 @@ setup-tc:
delete-tc:
docker exec -i two-auth /bin/bash -c "tctl -c /root/go/src/github.com/gravitational/teleport/docker/two-auth.yaml rm tc/one"
# location of test license file
TEST_LICENSE ?= ../e/fixtures/license.pem
.PHONY: check-license
check-license:
@if [ -f $(TEST_LICENSE) ]; then \
mkdir -p ./data/one && cp $(TEST_LICENSE) ./data/one; \
mkdir -p ./data/two/auth && cp $(TEST_LICENSE) ./data/two/auth; \
@if [ $(MODE) = "enterprise" ] && [ -f $(ENTERPRISE_LICENSE) ]; then \
mkdir -p ./data/one && cp $(ENTERPRISE_LICENSE) ./data/one/license.pem; \
mkdir -p ./data/two/auth && cp $(ENTERPRISE_LICENSE) ./data/two/auth/license.pem; \
fi
@if [ $(MODE) = "pro" ] && [ -f $(PRO_LICENSE) ]; then \
mkdir -p ./data/one && cp $(PRO_LICENSE) ./data/one/license.pem; \
mkdir -p ./data/two/auth && cp $(PRO_LICENSE) ./data/two/auth/license.pem; \
fi
.PHONY: build

2
e

@ -1 +1 @@
Subproject commit bb57cea60870675e94ab82530294885ddd5ed46d
Subproject commit 1b07ab3783aaffd52ed538bacbd669bfe58fedcc