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

Fix an issue where mercurial wasn't getting installed in the image

Browse Source 
Also fixes an issue assigning proxy environment variables
This commit is contained in:
Matthew Jones
2017-09-28 11:37:10 -04:00
parent cd35704b0b
commit 128eaaf60f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ RUN chgrp -Rf root /var/lib/awx && chmod -Rf g+w /var/lib/awx
RUN yum -y install epel-release && \ RUN yum -y install epel-release && \
yum -y localinstall http://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm && \ yum -y localinstall http://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm && \
yum -y update && \ yum -y update && \
yum -y install ansible git subversion curl python-psycopg2 python-pip python-setuptools libselinux-python setools-libs yum-utils sudo acl make postgresql-devel nginx python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap gcc-c++ python-devel krb5-workstation krb5-libs && \ yum -y install ansible git mercurial subversion curl python-psycopg2 python-pip python-setuptools libselinux-python setools-libs yum-utils sudo acl make postgresql-devel nginx python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap gcc-c++ python-devel krb5-workstation krb5-libs && \
pip install virtualenv supervisor && \ pip install virtualenv supervisor && \
VENV_BASE=/var/lib/awx/venv make requirements_ansible && \ VENV_BASE=/var/lib/awx/venv make requirements_ansible && \
VENV_BASE=/var/lib/awx/venv make requirements_awx && \ VENV_BASE=/var/lib/awx/venv make requirements_awx && \

12
installer/local_docker/tasks/main.yml
View File

@@ -187,9 +187,9 @@
links: "{{ awx_web_container_links|list }}" links: "{{ awx_web_container_links|list }}"
hostname: awxweb hostname: awxweb
env: env:
http_proxy: "{{ http_proxy | default(omit) }}" http_proxy: "{{ http_proxy | default('') }}"
https_proxy: "{{ https_proxy | default(omit) }}" https_proxy: "{{ https_proxy | default('') }}"
no_proxy: "{{ no_proxy | default(omit) }}" no_proxy: "{{ no_proxy | default('') }}"
SECRET_KEY: "{{ awx_secret_key }}" SECRET_KEY: "{{ awx_secret_key }}"
DATABASE_NAME: "{{ pg_database }}" DATABASE_NAME: "{{ pg_database }}"
DATABASE_USER: "{{ pg_username }}" DATABASE_USER: "{{ pg_username }}"
@@ -216,9 +216,9 @@
user: root user: root
hostname: awx hostname: awx
env: env:
http_proxy: "{{ http_proxy | default(omit) }}" http_proxy: "{{ http_proxy | default('') }}"
https_proxy: "{{ https_proxy | default(omit) }}" https_proxy: "{{ https_proxy | default('') }}"
no_proxy: "{{ no_proxy | default(omit) }}" no_proxy: "{{ no_proxy | default('') }}"
SECRET_KEY: "{{ awx_secret_key }}" SECRET_KEY: "{{ awx_secret_key }}"
DATABASE_NAME: "{{ pg_database }}" DATABASE_NAME: "{{ pg_database }}"
DATABASE_USER: "{{ pg_username }}" DATABASE_USER: "{{ pg_username }}"