diff options
| author | Christian Adams <chadams@redhat.com> | 2020-03-11 19:12:56 +0100 |
|---|---|---|
| committer | Christian Adams <chadams@redhat.com> | 2020-03-11 21:23:31 +0100 |
| commit | 3755151cc52ed9ba4714a47b8f22dbfa2bf572fe (patch) | |
| tree | efeb83bd193d332c098041c348e71cc565af7e7a /tools | |
| parent | Merge pull request #6219 from dsesami/host-detail-labels (diff) | |
| download | awx-3755151cc52ed9ba4714a47b8f22dbfa2bf572fe.tar.xz awx-3755151cc52ed9ba4714a47b8f22dbfa2bf572fe.zip | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose.yml | 2 | ||||
| -rw-r--r-- | tools/docker-compose/Dockerfile | 4 | ||||
| -rwxr-xr-x | tools/docker-compose/launch_awx.sh (renamed from tools/docker-compose/start_development.sh) | 2 |
3 files changed, 4 insertions, 4 deletions
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 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 |