Update docker development workflow to not require make develop

This commit is contained in:
Matthew Jones 2016-03-02 12:09:15 -05:00
parent 9d24236632
commit 714d13eefd
11 changed files with 19070 additions and 10 deletions

2
.gitignore vendored
View File

@ -34,7 +34,7 @@ __pycache__
/tar-build
/setup-bundle-build
/dist
*.egg-info
/*.egg-info
*.py[c,o]
# JavaScript

View File

@ -273,9 +273,9 @@ version_file:
# Do any one-time init tasks.
init:
@if [ "$(VIRTUAL_ENV)" ]; then \
awx-manage register_instance --primary --hostname=127.0.0.1; \
tower-manage register_instance --primary --hostname=127.0.0.1; \
else \
sudo awx-manage register_instance --primary --hostname=127.0.0.1; \
sudo tower-manage register_instance --primary --hostname=127.0.0.1; \
fi
# Refresh development environment after pulling new code.
@ -358,7 +358,7 @@ pylint: reports
@(set -o pipefail && $@ | reports/$@.report)
check: flake8 pep8 # pyflakes pylint
# Run all API unit tests.
test:
py.test awx/main/tests awx/api/tests awx/fact/tests

View File

@ -23,6 +23,9 @@ RUN pip2 install honcho
RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.0.0/dumb-init_1.0.0_amd64.deb
RUN dpkg -i dumb-init_*.deb
ADD start_development.sh /start_development.sh
ADD ansible-tower.egg-link /usr/local/lib/python2.7/dist-packages/ansible-tower.egg-link
ADD tower-manage /usr/local/bin/tower-manage
ADD ansible_tower.egg-info /tmp/ansible_tower.egg-info
EXPOSE 8013 8080 22
ENTRYPOINT ["/usr/bin/dumb-init"]

View File

@ -0,0 +1 @@
/tower_devel

View File

@ -0,0 +1,23 @@
Metadata-Version: 1.1
Name: ansible-tower
Version: 3.0.0-0.devel
Summary: ansible-tower: API, UI and Task Engine for Ansible
Home-page: http://github.com/ansible/ansible-commander
Author: Ansible, Inc.
Author-email: support@ansible.com
License: Proprietary
Description: AWX provides a web-based user interface, REST API and task engine built on top of Ansible
Keywords: ansible
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Web Environment
Classifier: Framework :: Django
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Information Technology
Classifier: Intended Audience :: System AdministratorsLicense :: Other/Proprietary License
Classifier: Natural Language :: English
Classifier: Operating System :: OS Independent
Classifier: Operating System :: POSIX
Classifier: Programming Language :: Python
Classifier: Topic :: System :: Installation/Setup
Classifier: Topic :: System :: Systems Administration

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,4 @@
[console_scripts]
tower-manage = awx:manage
awx-manage = awx:manage

View File

@ -0,0 +1 @@

View File

@ -0,0 +1 @@
awx

View File

@ -20,12 +20,8 @@ else
echo "Failed to find tower source tree, map your development tree volume"
fi
if [ -f "/.develop_run" ]; then
echo "Skipping 'make develop' step since it has already run - remove /.develop_run to force it"
else
make develop
touch /.develop_run
fi
rm -rf /tower_devel/ansible_tower.egg-info
mv /tmp/ansible_tower.egg-info /tower_devel/
# Check if we need to build dependencies
if [ -f "awx/lib/.deps_built" ]; then