External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3993 from shanemcd/fix-isolated-dev-env

Browse Source 
Fix isolated dev env

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-06-03 21:43:31 +00:00
committed by GitHub
parent 1829017ad4 f18f9ec0ef
commit 67fb898a9d
5 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -590,12 +590,12 @@ docker-compose-build: awx-devel-build
# Base development image build # Base development image build
awx-devel-build: awx-devel-build:
docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile . docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile --cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) .
docker tag ansible/awx_devel $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) docker tag ansible/awx_devel $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
#docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) #docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
# For use when developing on "isolated" AWX deployments # For use when developing on "isolated" AWX deployments
awx-isolated-build: awx-isolated-build: awx-devel-build
docker build -t ansible/awx_isolated -f tools/docker-isolated/Dockerfile . docker build -t ansible/awx_isolated -f tools/docker-isolated/Dockerfile .
docker tag ansible/awx_isolated $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG) docker tag ansible/awx_isolated $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG)
#docker push $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG) #docker push $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG)

1
awx/settings/development.py
View File

@@ -83,6 +83,7 @@ AWX_PROOT_ENABLED = True
AWX_ISOLATED_USERNAME = 'root' AWX_ISOLATED_USERNAME = 'root'
AWX_ISOLATED_CHECK_INTERVAL = 1 AWX_ISOLATED_CHECK_INTERVAL = 1
AWX_ISOLATED_PERIODIC_CHECK = 30
AWX_ISOLATED_LAUNCH_TIMEOUT = 30 AWX_ISOLATED_LAUNCH_TIMEOUT = 30
# Disable Pendo on the UI for development/test. # Disable Pendo on the UI for development/test.

3
tools/docker-compose/Dockerfile
View File

@@ -73,8 +73,7 @@ RUN yum -y install acl \
xorg-x11-utils \ xorg-x11-utils \
yum-utils yum-utils
ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini RUN yum install -y https://github.com/krallin/tini/releases/download/v0.18.0/tini_0.18.0.rpm
RUN chmod +x /tini
RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa
RUN mkdir -p /data/db RUN mkdir -p /data/db

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

@@ -5,4 +5,4 @@ set +x
cd /awx_devel cd /awx_devel
# Start the services # Start the services
exec /tini -- make supervisor exec tini -- make supervisor

30
tools/docker-isolated/Dockerfile
View File

@@ -1,23 +1,9 @@
FROM centos:7 ARG TAG=latest
RUN yum clean all FROM ansible/awx_devel:${TAG}
ADD Makefile /tmp/Makefile RUN yum install -y gcc python36-devel
RUN mkdir /tmp/requirements RUN python3 -m ensurepip && pip3 install virtualenv ansible-runner
ADD requirements/requirements_ansible.txt requirements/requirements_ansible_git.txt requirements/requirements_ansible_uninstall.txt /tmp/requirements/ RUN yum remove -y gcc python36-devel && rm -rf /var/cache/yum
RUN yum -y update && yum -y install curl epel-release
RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git python-devel python36 python36-devel python-psycopg2 make python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap zanata-python-client gettext gcc-c++ libcurl-devel python-pycurl bzip2
RUN python3 -m ensurepip
RUN pip3 install virtualenv
RUN pip3 install ansible-runner
WORKDIR /tmp
RUN make requirements_ansible
RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
WORKDIR /
EXPOSE 22
RUN rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_rsa_key RUN rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_rsa_key
RUN ssh-keygen -q -N "" -t dsa -f /etc/ssh/ssh_host_ecdsa_key RUN ssh-keygen -q -N "" -t dsa -f /etc/ssh/ssh_host_ecdsa_key
@@ -28,7 +14,7 @@ RUN sed -i "s/#StrictModes.*/StrictModes no/g" /etc/ssh/sshd_config
RUN mkdir -p /root/.ssh RUN mkdir -p /root/.ssh
RUN ln -s /awx_devel/authorized_keys /root/.ssh/authorized_keys RUN ln -s /awx_devel/authorized_keys /root/.ssh/authorized_keys
ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini ENTRYPOINT ["tini", "--"]
RUN chmod +x /tini
ENTRYPOINT ["/tini", "--"]
CMD ["/usr/sbin/sshd", "-D"] CMD ["/usr/sbin/sshd", "-D"]
EXPOSE 22