summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMatthew Jones <bsdmatburt@gmail.com>2017-07-22 06:06:44 +0200
committerMatthew Jones <bsdmatburt@gmail.com>2017-07-22 06:08:38 +0200
commite9dde459c735c7aa677dda86e085be8aed17591d (patch)
treede102142e966163ca1b39eea6c87ad7dd2105895 /tools
parentMake packaging work with our internal build systems (diff)
downloadawx-e9dde459c735c7aa677dda86e085be8aed17591d.tar.xz
awx-e9dde459c735c7aa677dda86e085be8aed17591d.zip
Updating some dev environment tooling for version numbers
Diffstat (limited to 'tools')
-rw-r--r--tools/docker-compose/Dockerfile4
-rw-r--r--tools/docker-compose/ansible-awx.egg-link (renamed from tools/docker-compose/ansible-tower.egg-link)0
-rw-r--r--tools/docker-compose/ansible_awx.egg-info/PKG-INFO (renamed from tools/docker-compose/ansible_tower.egg-info/PKG-INFO)10
-rw-r--r--tools/docker-compose/ansible_awx.egg-info/SOURCES.txt (renamed from tools/docker-compose/ansible_tower.egg-info/SOURCES.txt)0
-rw-r--r--tools/docker-compose/ansible_awx.egg-info/dependency_links.txt (renamed from tools/docker-compose/ansible_tower.egg-info/dependency_links.txt)0
-rw-r--r--tools/docker-compose/ansible_awx.egg-info/entry_points.txt (renamed from tools/docker-compose/ansible_tower.egg-info/entry_points.txt)0
-rw-r--r--tools/docker-compose/ansible_awx.egg-info/not-zip-safe (renamed from tools/docker-compose/ansible_tower.egg-info/not-zip-safe)0
-rw-r--r--tools/docker-compose/ansible_awx.egg-info/top_level.txt (renamed from tools/docker-compose/ansible_tower.egg-info/top_level.txt)0
-rwxr-xr-xtools/docker-compose/awx-manage6
-rwxr-xr-xtools/docker-compose/start_development.sh6
10 files changed, 14 insertions, 12 deletions
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
index bce047d354..bce047d354 100644
--- a/tools/docker-compose/ansible-tower.egg-link
+++ b/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
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
index 1d220664e0..1d220664e0 100644
--- a/tools/docker-compose/ansible_tower.egg-info/SOURCES.txt
+++ b/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
index 8b13789179..8b13789179 100644
--- a/tools/docker-compose/ansible_tower.egg-info/dependency_links.txt
+++ b/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
index a0ad90d8ce..a0ad90d8ce 100644
--- a/tools/docker-compose/ansible_tower.egg-info/entry_points.txt
+++ b/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
index 8b13789179..8b13789179 100644
--- a/tools/docker-compose/ansible_tower.egg-info/not-zip-safe
+++ b/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
index d4dba9cc49..d4dba9cc49 100644
--- a/tools/docker-compose/ansible_tower.egg-info/top_level.txt
+++ b/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