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

Merge pull request #6721 from shanemcd/dockerfile-cleanup

Browse Source 
Dockerfile organization

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-04-16 14:48:58 +00:00
committed by GitHub
parent fa1c33da7e 29a582f869
commit e19194b883
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/docker-compose/Dockerfile
View File

@@ -8,6 +8,7 @@ ENV LC_ALL en_US.UTF-8
ADD tools/docker-compose/ansible_nightly.repo /etc/yum.repos.d/ansible_nightly.repo
ADD tools/docker-compose/google-cloud-sdk.repo /etc/yum.repos.d/
ADD tools/docker-compose/rsyslog.repo /etc/yum.repos.d/
# sync with installer/roles/image_build/templates/Dockerfile.j2
RUN dnf -y update && \
@@ -50,6 +51,7 @@ RUN dnf -y update && \
python3-setuptools \
python3-pycurl \
rsync \
rsyslog-omhttp \
subversion \
sudo \
swig \
@@ -120,6 +122,7 @@ ADD tools/docker-compose/launch_awx.sh /usr/bin/launch_awx.sh
ADD tools/docker-compose/start_tests.sh /start_tests.sh
ADD tools/docker-compose/bootstrap_development.sh /usr/bin/bootstrap_development.sh
ADD tools/docker-compose/entrypoint.sh /
ADD tools/docker-compose/rsyslog.conf /var/lib/awx/rsyslog/rsyslog.conf
ADD tools/scripts/awx-python /usr/bin/awx-python
# Pre-create things that we need to write to
@@ -129,13 +132,6 @@ RUN for dir in /var/lib/awx /var/lib/awx/rsyslog /var/lib/awx/rsyslog/conf.d /va
for file in /etc/passwd /etc/supervisord.conf /venv/awx/lib/python3.6/site-packages/awx.egg-link /var/run/nginx.pid; \
do touch $file; chmod -R g+rwx $file; chgrp -R root $file; done
RUN chmod -R 0775 /var/lib/awx /var/lib/awx/rsyslog
ADD tools/docker-compose/rsyslog.repo /etc/yum.repos.d/
RUN yum install -y rsyslog-omhttp
ADD tools/docker-compose/rsyslog.conf /var/lib/awx/rsyslog/rsyslog.conf
RUN chmod 0775 /var/lib/awx/rsyslog/rsyslog.conf
ENV HOME /var/lib/awx
ENV PATH="/usr/local/n/versions/node/10.15.0/bin:${PATH}"
ENV PATH="/usr/pgsql-10/bin:${PATH}"