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

Improve dev environment init process

Browse Source 
This ensures that /etc/passwd is always written, regardless of how the container starts.
This commit is contained in:
Shane McDonald
2019-05-10 10:14:51 -04:00
parent 015234287c
commit 7d8a910be7
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/docker-compose.yml
View File

@@ -6,6 +6,7 @@ services:
image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG} image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG}
container_name: tools_awx_1 container_name: tools_awx_1
hostname: awx hostname: awx
command: /start_development.sh
environment: environment:
CURRENT_UID: CURRENT_UID:
RABBITMQ_HOST: rabbitmq RABBITMQ_HOST: rabbitmq

17
tools/docker-compose/Dockerfile
View File

@@ -64,12 +64,6 @@ ADD tools/docker-compose/awx.egg-link /tmp/awx.egg-link
ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage
ADD tools/docker-compose/awx.egg-info /tmp/awx.egg-info ADD tools/docker-compose/awx.egg-info /tmp/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
RUN ln -s /awx_devel/tools/docker-compose/start_tests.sh /start_tests.sh
RUN ln -s /awx_devel/tools/docker-compose/bootstrap_development.sh /bootstrap_development.sh
RUN openssl req -nodes -newkey rsa:2048 -keyout /etc/nginx/nginx.key -out /etc/nginx/nginx.csr -subj "/C=US/ST=North Carolina/L=Durham/O=Ansible/OU=AWX Development/CN=awx.localhost" RUN openssl req -nodes -newkey rsa:2048 -keyout /etc/nginx/nginx.key -out /etc/nginx/nginx.csr -subj "/C=US/ST=North Carolina/L=Durham/O=Ansible/OU=AWX Development/CN=awx.localhost"
RUN openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/nginx.key -out /etc/nginx/nginx.crt RUN openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/nginx.key -out /etc/nginx/nginx.crt
@@ -118,12 +112,17 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
WORKDIR / ADD tools/docker-compose/nginx.conf /etc/nginx/nginx.conf
ADD tools/docker-compose/nginx.vh.default.conf /etc/nginx/conf.d/nginx.vh.default.conf
ADD tools/docker-compose/start_development.sh /start_development.sh
ADD tools/docker-compose/start_tests.sh /start_tests.sh
ADD tools/docker-compose/bootstrap_development.sh /bootstrap_development.sh
EXPOSE 8043 8013 8080 22 EXPOSE 8043 8013 8080 22
ENTRYPOINT ["/tini", "--"] ADD tools/docker-compose/entrypoint.sh /
CMD /start_development.sh ENTRYPOINT ["/entrypoint.sh"]
CMD ["/bin/bash"]
# Pre-create things that we need to write to # Pre-create things that we need to write to
RUN for dir in /var/lib/awx/ /var/log/tower/ /projects /.ansible /var/log/nginx /var/lib/nginx /.local; \ RUN for dir in /var/lib/awx/ /var/log/tower/ /projects /.ansible /var/log/nginx /var/lib/nginx /.local; \

7
tools/docker-compose/bootstrap_development.sh
View File

@@ -1,13 +1,6 @@
#!/bin/bash #!/bin/bash
set +x set +x
if [ `id -u` -ge 500 ] || [ -z "${CURRENT_UID}" ]; then
echo "root:x:0:0:root:/root:/bin/bash" > /tmp/password
echo "awx:x:`id -u`:`id -g`:,,,:/tmp:/bin/bash" >> /tmp/passwd
cat /tmp/passwd > /etc/passwd
rm /tmp/passwd
fi
# Wait for the databases to come up # Wait for the databases to come up
ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=postgres port=5432" all ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=postgres port=5432" all
ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=memcached port=11211" all ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=memcached port=11211" all

14
tools/docker-compose/entrypoint.sh Executable file
View File

@@ -0,0 +1,14 @@
#!/bin/bash
if [ `id -u` -ge 500 ] || [ -z "${CURRENT_UID}" ]; then
cat << EOF > /tmp/passwd
root:x:0:0:root:/root:/bin/bash
awx:x:`id -u`:`id -g`:,,,:/tmp:/bin/bash
EOF
cat /tmp/passwd > /etc/passwd
rm /tmp/passwd
fi
exec $@

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
make supervisor exec /tini -- make supervisor