From f0d68f429c410d8cefbd7c60232d6c31d172d1dc Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Sat, 22 Jul 2017 00:06:44 -0400 Subject: [PATCH] Updating some dev environment tooling for version numbers --- tools/docker-compose/Dockerfile | 4 ++-- .../{ansible-tower.egg-link => ansible-awx.egg-link} | 0 .../PKG-INFO | 10 +++++----- .../SOURCES.txt | 0 .../dependency_links.txt | 0 .../entry_points.txt | 0 .../not-zip-safe | 0 .../top_level.txt | 0 tools/docker-compose/awx-manage | 6 +++--- tools/docker-compose/start_development.sh | 6 ++++-- 10 files changed, 14 insertions(+), 12 deletions(-) rename tools/docker-compose/{ansible-tower.egg-link => ansible-awx.egg-link} (100%) rename tools/docker-compose/{ansible_tower.egg-info => ansible_awx.egg-info}/PKG-INFO (73%) rename tools/docker-compose/{ansible_tower.egg-info => ansible_awx.egg-info}/SOURCES.txt (100%) rename tools/docker-compose/{ansible_tower.egg-info => ansible_awx.egg-info}/dependency_links.txt (100%) rename tools/docker-compose/{ansible_tower.egg-info => ansible_awx.egg-info}/entry_points.txt (100%) rename tools/docker-compose/{ansible_tower.egg-info => ansible_awx.egg-info}/not-zip-safe (100%) rename tools/docker-compose/{ansible_tower.egg-info => ansible_awx.egg-info}/top_level.txt (100%) diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 5a5ca22cbb..b9e5298901 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -20,9 +20,9 @@ RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa RUN mkdir -p /data/db RUN pip2 install honcho 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/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.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 diff --git a/tools/docker-compose/ansible-tower.egg-link b/tools/docker-compose/ansible-awx.egg-link similarity index 100% rename from tools/docker-compose/ansible-tower.egg-link rename to tools/docker-compose/ansible-awx.egg-link diff --git a/tools/docker-compose/ansible_tower.egg-info/PKG-INFO b/tools/docker-compose/ansible_awx.egg-info/PKG-INFO similarity index 73% rename from tools/docker-compose/ansible_tower.egg-info/PKG-INFO rename to tools/docker-compose/ansible_awx.egg-info/PKG-INFO index 0d78373ace..eb633cdebb 100644 --- a/tools/docker-compose/ansible_tower.egg-info/PKG-INFO +++ b/tools/docker-compose/ansible_awx.egg-info/PKG-INFO @@ -1,12 +1,12 @@ 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-tower +Name: ansible-awx +Version: placeholder +Summary: ansible-awx: API, UI and Task Engine for Ansible +Home-page: http://github.com/ansible/ansible-awx Author: Ansible, Inc. Author-email: info@ansible.com 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 Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable diff --git a/tools/docker-compose/ansible_tower.egg-info/SOURCES.txt b/tools/docker-compose/ansible_awx.egg-info/SOURCES.txt similarity index 100% rename from tools/docker-compose/ansible_tower.egg-info/SOURCES.txt rename to tools/docker-compose/ansible_awx.egg-info/SOURCES.txt diff --git a/tools/docker-compose/ansible_tower.egg-info/dependency_links.txt b/tools/docker-compose/ansible_awx.egg-info/dependency_links.txt similarity index 100% rename from tools/docker-compose/ansible_tower.egg-info/dependency_links.txt rename to tools/docker-compose/ansible_awx.egg-info/dependency_links.txt diff --git a/tools/docker-compose/ansible_tower.egg-info/entry_points.txt b/tools/docker-compose/ansible_awx.egg-info/entry_points.txt similarity index 100% rename from tools/docker-compose/ansible_tower.egg-info/entry_points.txt rename to tools/docker-compose/ansible_awx.egg-info/entry_points.txt diff --git a/tools/docker-compose/ansible_tower.egg-info/not-zip-safe b/tools/docker-compose/ansible_awx.egg-info/not-zip-safe similarity index 100% rename from tools/docker-compose/ansible_tower.egg-info/not-zip-safe rename to tools/docker-compose/ansible_awx.egg-info/not-zip-safe diff --git a/tools/docker-compose/ansible_tower.egg-info/top_level.txt b/tools/docker-compose/ansible_awx.egg-info/top_level.txt similarity index 100% rename from tools/docker-compose/ansible_tower.egg-info/top_level.txt rename to tools/docker-compose/ansible_awx.egg-info/top_level.txt diff --git a/tools/docker-compose/awx-manage b/tools/docker-compose/awx-manage index 1d728c5949..d4dff5664a 100755 --- a/tools/docker-compose/awx-manage +++ b/tools/docker-compose/awx-manage @@ -1,10 +1,10 @@ #!/venv/awx/bin/python -# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-tower==3.0.0-0.devel','console_scripts','awx-manage' -__requires__ = 'ansible-tower==3.0.0-0.devel' +# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-awx==placeholder','console_scripts','awx-manage' +__requires__ = 'ansible-awx==placeholder' import sys from pkg_resources import load_entry_point if __name__ == '__main__': 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')() ) diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh index cfe38868a7..c1032bf848 100755 --- a/tools/docker-compose/start_development.sh +++ b/tools/docker-compose/start_development.sh @@ -21,8 +21,10 @@ else echo "Failed to find awx source tree, map your development tree volume" fi -cp -nR /tmp/ansible_tower.egg-info /awx_devel/ || true -cp /tmp/ansible-tower.egg-link /venv/awx/lib/python2.7/site-packages/ansible-tower.egg-link +cp -R /tmp/ansible_awx.egg-info /awx_devel/ || true +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 yes | cp -rf /awx_devel/tools/docker-compose/supervisor.conf /supervisor.conf