External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove license_key check & fix docker-compose make command

Browse Source
This commit is contained in:
Christian M. Adams
2020-10-22 16:49:13 -04:00
committed by Ryan Petrello
parent 0ddf47740c
commit 67000f0ce9
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -650,7 +650,7 @@ awx/projects:
docker-compose-isolated: awx/projects docker-compose-isolated: awx/projects
CURRENT_UID=$(shell id -u) TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose -f tools/docker-compose.yml -f tools/docker-isolated-override.yml up CURRENT_UID=$(shell id -u) TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose -f tools/docker-compose.yml -f tools/docker-isolated-override.yml up
COMPOSE_UP_OPTS ?= "" COMPOSE_UP_OPTS ?=
# Docker Compose Development environment # Docker Compose Development environment
docker-compose: docker-auth awx/projects docker-compose: docker-auth awx/projects

1
awxkit/awxkit/api/pages/config.py
View File

@@ -14,7 +14,6 @@ class Config(base.Base):
@property @property
def is_valid_license(self): def is_valid_license(self):
return self.license_info.get('valid_key', False) and \ return self.license_info.get('valid_key', False) and \
'license_key' in self.license_info and \
'instance_count' in self.license_info 'instance_count' in self.license_info
@property @property