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

Updating some dev environment tooling for version numbers

Browse Source
This commit is contained in:
Matthew Jones
2017-07-22 00:06:44 -04:00
parent 17db724932
commit e9dde459c7
10 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/docker-compose/Dockerfile
View File

@@ -20,9 +20,9 @@ RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa
RUN mkdir -p /data/db RUN mkdir -p /data/db
RUN pip2 install honcho RUN pip2 install honcho
RUN pip2 install supervisor RUN pip2 install supervisor
ADD tools/docker-compose/ansible-tower.egg-link /tmp/ansible-tower.egg-link ADD tools/docker-compose/ansible-awx.egg-link /tmp/ansible-awx.egg-link
ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage
ADD tools/docker-compose/ansible_tower.egg-info /tmp/ansible_tower.egg-info ADD tools/docker-compose/ansible_awx.egg-info /tmp/ansible_awx.egg-info
RUN ln -Ffs /awx_devel/tools/docker-compose/nginx.conf /etc/nginx/nginx.conf RUN ln -Ffs /awx_devel/tools/docker-compose/nginx.conf /etc/nginx/nginx.conf
RUN ln -Ffs /awx_devel/tools/docker-compose/nginx.vh.default.conf /etc/nginx/conf.d/nginx.vh.default.conf RUN ln -Ffs /awx_devel/tools/docker-compose/nginx.vh.default.conf /etc/nginx/conf.d/nginx.vh.default.conf
RUN ln -s /awx_devel/tools/docker-compose/start_development.sh /start_development.sh RUN ln -s /awx_devel/tools/docker-compose/start_development.sh /start_development.sh

0
tools/docker-compose/ansible-tower.egg-link → tools/docker-compose/ansible-awx.egg-link
View File

10
tools/docker-compose/ansible_tower.egg-info/PKG-INFO → tools/docker-compose/ansible_awx.egg-info/PKG-INFO
View File

@@ -1,12 +1,12 @@
Metadata-Version: 1.1 Metadata-Version: 1.1
Name: ansible-tower Name: ansible-awx
Version: 3.0.0-0.devel Version: placeholder
Summary: ansible-tower: API, UI and Task Engine for Ansible Summary: ansible-awx: API, UI and Task Engine for Ansible
Home-page: http://github.com/ansible/ansible-tower Home-page: http://github.com/ansible/ansible-awx
Author: Ansible, Inc. Author: Ansible, Inc.
Author-email: info@ansible.com Author-email: info@ansible.com
License: Proprietary License: Proprietary
Description: Ansible Tower provides a web-based user interface, REST API and task engine built on top of Ansible Description: Ansible AWXprovides a web-based user interface, REST API and task engine built on top of Ansible
Keywords: ansible Keywords: ansible
Platform: UNKNOWN Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable Classifier: Development Status :: 5 - Production/Stable

0
tools/docker-compose/ansible_tower.egg-info/SOURCES.txt → tools/docker-compose/ansible_awx.egg-info/SOURCES.txt
View File

0
tools/docker-compose/ansible_tower.egg-info/dependency_links.txt → tools/docker-compose/ansible_awx.egg-info/dependency_links.txt
View File

0
tools/docker-compose/ansible_tower.egg-info/entry_points.txt → tools/docker-compose/ansible_awx.egg-info/entry_points.txt
View File

0
tools/docker-compose/ansible_tower.egg-info/not-zip-safe → tools/docker-compose/ansible_awx.egg-info/not-zip-safe
View File

0
tools/docker-compose/ansible_tower.egg-info/top_level.txt → tools/docker-compose/ansible_awx.egg-info/top_level.txt
View File

6
tools/docker-compose/awx-manage
View File

@@ -1,10 +1,10 @@
#!/venv/awx/bin/python #!/venv/awx/bin/python
# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-tower==3.0.0-0.devel','console_scripts','awx-manage' # EASY-INSTALL-ENTRY-SCRIPT: 'ansible-awx==placeholder','console_scripts','awx-manage'
__requires__ = 'ansible-tower==3.0.0-0.devel' __requires__ = 'ansible-awx==placeholder'
import sys import sys
from pkg_resources import load_entry_point from pkg_resources import load_entry_point
if __name__ == '__main__': if __name__ == '__main__':
sys.exit( sys.exit(
load_entry_point('ansible-tower==3.0.0-0.devel', 'console_scripts', 'awx-manage')() load_entry_point('ansible-awx==placeholder', 'console_scripts', 'awx-manage')()
) )

6
tools/docker-compose/start_development.sh
View File

@@ -21,8 +21,10 @@ else
echo "Failed to find awx source tree, map your development tree volume" echo "Failed to find awx source tree, map your development tree volume"
fi fi
cp -nR /tmp/ansible_tower.egg-info /awx_devel/ || true cp -R /tmp/ansible_awx.egg-info /awx_devel/ || true
cp /tmp/ansible-tower.egg-link /venv/awx/lib/python2.7/site-packages/ansible-tower.egg-link sed -i "s/placeholder/$(git describe --long | sed 's/\./\\./g')/" /awx_devel/ansible_awx.egg-info/PKG-INFO
sed -i "s/placeholder/$(git describe --long | sed 's/\./\\./g')/" /usr/local/bin/awx-manage
cp /tmp/ansible-awx.egg-link /venv/awx/lib/python2.7/site-packages/ansible-awx.egg-link
ln -s /awx_devel/tools/rdb.py /venv/awx/lib/python2.7/site-packages/rdb.py || true ln -s /awx_devel/tools/rdb.py /venv/awx/lib/python2.7/site-packages/rdb.py || true
yes | cp -rf /awx_devel/tools/docker-compose/supervisor.conf /supervisor.conf yes | cp -rf /awx_devel/tools/docker-compose/supervisor.conf /supervisor.conf