External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 15:27:47 -02:30
Code Issues Packages Projects Releases Wiki Activity

Collections: Adding a requirements.yml file

Browse Source
This commit is contained in:
Yanis Guenane
2020-03-11 15:08:57 +01:00
committed by AlanCoding
parent 37491fa4b9
commit 541b9607f5
5 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST.in
View File

@@ -10,6 +10,7 @@ recursive-include awx/playbooks *.yml
recursive-include awx/lib/site-packages * recursive-include awx/lib/site-packages *
recursive-include awx/plugins *.ps1 recursive-include awx/plugins *.ps1
recursive-include requirements *.txt recursive-include requirements *.txt
recursive-include requirements *.yml
recursive-include config * recursive-include config *
recursive-include docs/licenses * recursive-include docs/licenses *
recursive-exclude awx devonly.py* recursive-exclude awx devonly.py*

6
Makefile
View File

@@ -209,7 +209,11 @@ requirements_awx: virtualenv_awx
requirements_awx_dev: requirements_awx_dev:
$(VENV_BASE)/awx/bin/pip install -r requirements/requirements_dev.txt $(VENV_BASE)/awx/bin/pip install -r requirements/requirements_dev.txt
requirements: requirements_ansible requirements_awx requirements_collections:
mkdir -p $(COLLECTION_BASE)
ansible-galaxy collection install -r requirements/collections_requirements.yml -p $(COLLECTION_BASE)
requirements: requirements_ansible requirements_awx requirements_collections
requirements_dev: requirements_awx requirements_ansible_py3 requirements_awx_dev requirements_ansible_dev requirements_dev: requirements_awx requirements_ansible_py3 requirements_awx_dev requirements_ansible_dev

2
installer/roles/image_build/templates/Dockerfile.j2
View File

@@ -74,8 +74,10 @@ ADD requirements/requirements_ansible.txt \
requirements/requirements.txt \ requirements/requirements.txt \
requirements/requirements_tower_uninstall.txt \ requirements/requirements_tower_uninstall.txt \
requirements/requirements_git.txt \ requirements/requirements_git.txt \
requirements/collections_requirements.yml \
/tmp/requirements/ /tmp/requirements/
RUN cd /tmp && VENV_BASE="/var/lib/awx/venv" make requirements_awx requirements_ansible_py3 RUN cd /tmp && VENV_BASE="/var/lib/awx/venv" make requirements_awx requirements_ansible_py3
RUN cd /tmp && COLLECTION_BASE="/var/lib/awx/vendor/inventory_collections" make requirements_collections
COPY {{ awx_sdist_file }} /tmp/{{ awx_sdist_file }} COPY {{ awx_sdist_file }} /tmp/{{ awx_sdist_file }}
RUN echo "{{ awx_version }}" > /var/lib/awx/.tower_version && \ RUN echo "{{ awx_version }}" > /var/lib/awx/.tower_version && \

5
requirements/collections_requirements.yml Normal file
View File

@@ -0,0 +1,5 @@
---
collections:
- name: awx.awx
version: 9.2.0
source: https://galaxy.ansible.com

3
tools/docker-compose/Dockerfile
View File

@@ -92,9 +92,12 @@ ADD requirements/requirements.txt \
requirements/requirements_dev.txt \ requirements/requirements_dev.txt \
requirements/requirements_ansible_uninstall.txt \ requirements/requirements_ansible_uninstall.txt \
requirements/requirements_tower_uninstall.txt \ requirements/requirements_tower_uninstall.txt \
requirements/collections_requirements.yml \
/tmp/requirements/ /tmp/requirements/
RUN mkdir -p /venv && chmod g+w /venv RUN mkdir -p /venv && chmod g+w /venv
RUN cd /tmp && VENV_BASE="/venv" make requirements_dev RUN cd /tmp && VENV_BASE="/venv" make requirements_dev
RUN mkdir -p /vendor/inventory_collections && chmod g+w /vendor/inventory_collections
RUN cd /tmp && COLLECTION_BASE="/vendor/inventory_collections" make requirements_collections
# Use the distro provided npm to bootstrap our required version of node # Use the distro provided npm to bootstrap our required version of node
RUN npm install -g n && n 10.15.0 && dnf remove -y nodejs RUN npm install -g n && n 10.15.0 && dnf remove -y nodejs