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

Merge pull request #6638 from ryanpetrello/isolated-bubblewrap

Browse Source 
Include the Tower venv in the isolated bubblewrapped arguments.
This commit is contained in:
Ryan Petrello
2017-06-19 16:06:40 -04:00
committed by GitHub
parent ba22b3426d 2ba9e56033
commit 157835ceac
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -302,13 +302,13 @@ requirements_ansible_dev:
fi fi
requirements_isolated: requirements_isolated:
if [ ! -d "$(VENV_BASE)/tower_isolated" ]; then \ if [ ! -d "$(VENV_BASE)/tower" ]; then \
virtualenv --system-site-packages $(VENV_BASE)/tower_isolated && \ virtualenv --system-site-packages $(VENV_BASE)/tower && \
$(VENV_BASE)/tower_isolated/bin/pip install $(PIP_OPTIONS) --ignore-installed six packaging appdirs && \ $(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed six packaging appdirs && \
$(VENV_BASE)/tower_isolated/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==35.0.2 && \ $(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==35.0.2 && \
$(VENV_BASE)/tower_isolated/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \ $(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \
fi; fi;
$(VENV_BASE)/tower_isolated/bin/pip install -r requirements/requirements_isolated.txt $(VENV_BASE)/tower/bin/pip install -r requirements/requirements_isolated.txt
# Install third-party requirements needed for Tower's environment. # Install third-party requirements needed for Tower's environment.
requirements_tower: virtualenv_tower requirements_tower: virtualenv_tower

2
awx/main/utils/common.py
View File

@@ -643,7 +643,7 @@ def wrap_args_with_proot(args, cwd, **kwargs):
show_paths = [cwd] show_paths = [cwd]
if settings.ANSIBLE_USE_VENV: if settings.ANSIBLE_USE_VENV:
show_paths.append(settings.ANSIBLE_VENV_PATH) show_paths.append(settings.ANSIBLE_VENV_PATH)
if settings.TOWER_USE_VENV and not kwargs.get('isolated'): if settings.TOWER_USE_VENV:
show_paths.append(settings.TOWER_VENV_PATH) show_paths.append(settings.TOWER_VENV_PATH)
show_paths.extend(getattr(settings, 'AWX_PROOT_SHOW_PATHS', None) or []) show_paths.extend(getattr(settings, 'AWX_PROOT_SHOW_PATHS', None) or [])
for path in sorted(set(show_paths)): for path in sorted(set(show_paths)):

2
tools/docker-isolated-override.yml
View File

@@ -11,7 +11,7 @@ services:
image: gcr.io/ansible-tower-engineering/tower_isolated:${TAG} image: gcr.io/ansible-tower-engineering/tower_isolated:${TAG}
hostname: isolated hostname: isolated
volumes: volumes:
- "../awx/main/isolated:/tower_isolated" - "../awx/main/isolated:/tower_devel"
- "../awx/lib:/tower_lib" - "../awx/lib:/tower_lib"
- "/sys/fs/cgroup:/sys/fs/cgroup:ro" - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
privileged: true privileged: true

4
tools/docker-isolated/tower-expect
View File

@@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
. /venv/tower_isolated/bin/activate . /venv/tower/bin/activate
exec env TOWER_LIB_DIRECTORY=/tower_lib /tower_isolated/run.py "$@" exec env TOWER_LIB_DIRECTORY=/tower_lib /tower_devel/run.py "$@"