From 3755151cc52ed9ba4714a47b8f22dbfa2bf572fe Mon Sep 17 00:00:00 2001 From: Christian Adams Date: Wed, 11 Mar 2020 14:12:56 -0400 Subject: [PATCH] Update dev container to be consistent with other installation methods - rename start_development.sh script to `launch_awx.sh`, like it is in k8 installations --- tools/docker-compose.yml | 2 +- tools/docker-compose/Dockerfile | 4 ++-- tools/docker-compose/{start_development.sh => launch_awx.sh} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename tools/docker-compose/{start_development.sh => launch_awx.sh} (76%) diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml index a327f914f9..aa35901257 100644 --- a/tools/docker-compose.yml +++ b/tools/docker-compose.yml @@ -7,7 +7,7 @@ services: image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG} container_name: tools_awx_1 hostname: awx - command: /start_development.sh + command: launch_awx.sh environment: CURRENT_UID: OS: diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 01389ce481..b713d7c291 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -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.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/bootstrap_development.sh /bootstrap_development.sh +ADD tools/docker-compose/bootstrap_development.sh /usr/bin/bootstrap_development.sh EXPOSE 8043 8013 8080 22 diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/launch_awx.sh similarity index 76% rename from tools/docker-compose/start_development.sh rename to tools/docker-compose/launch_awx.sh index 9454253e33..486c652cf3 100755 --- a/tools/docker-compose/start_development.sh +++ b/tools/docker-compose/launch_awx.sh @@ -1,7 +1,7 @@ #!/bin/bash set +x -/bootstrap_development.sh +bootstrap_development.sh cd /awx_devel # Start the services