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

Update dev container to be consistent with other installation methods

Browse Source 
- rename start_development.sh script to `launch_awx.sh`, like it is in k8 installations
This commit is contained in:
Christian Adams
2020-03-11 14:12:56 -04:00
parent 9a394a5726
commit 3755151cc5
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/docker-compose.yml
View File

@@ -7,7 +7,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 command: launch_awx.sh
environment: environment:
CURRENT_UID: CURRENT_UID:
OS: OS:

4
tools/docker-compose/Dockerfile
View File

@@ -121,9 +121,9 @@ ENV LC_ALL en_US.UTF-8
ADD tools/docker-compose/nginx.conf /etc/nginx/nginx.conf 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/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/launch_awx.sh /usr/bin/launch_awx.sh
ADD tools/docker-compose/start_tests.sh /start_tests.sh ADD tools/docker-compose/start_tests.sh /start_tests.sh
ADD tools/docker-compose/bootstrap_development.sh /bootstrap_development.sh ADD tools/docker-compose/bootstrap_development.sh /usr/bin/bootstrap_development.sh
EXPOSE 8043 8013 8080 22 EXPOSE 8043 8013 8080 22

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

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set +x set +x
/bootstrap_development.sh bootstrap_development.sh
cd /awx_devel cd /awx_devel
# Start the services # Start the services