From 9672e7283404f608abcf9f2a1489db7867d672a4 Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Wed, 27 Jan 2021 11:01:17 -0500 Subject: Consolidate the Local Docker installer and the dev env - removes local_docker installer and points community users to our development environment (make docker-compose) - provides a migration path from Local Docker Compose installations --> the dev environment - the dev env can now be configured to use an external database - consolidated the Local Docker and dev env docker-compose.yml files into one template file, used by the dockerfile role - added a 'sources' role to template out config files - the postgres data dir is no longer a bind-mount, it is a docker volume - the redis socket is not longer a bind-mount, it is a docker volume - the local_settings.py.docker-compose file no longer needs to be copied over in the dev env - Create tmp rsyslog.conf in rsyslog volume to avoid cross-linking. Previously, the tmp code-generated rsyslog.conf was being written to /tmp (by default). As a result, we were attempting to shutil.move() across volumes. - move k8s image build and push roles under tools/ansible - See tools/docker-compose/README.md for usage of these changes --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index b0d0e0bcfa..42275f9abb 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,11 @@ awx/ui_next/.env.local awx/ui_next/instrumented rsyslog.pid tools/prometheus/data +tools/docker-compose/ansible/awx_dump.sql tools/docker-compose/Dockerfile +tools/docker-compose/_build +tools/docker-compose/_sources +tools/docker-compose/overrides/ # Tower setup playbook testing setup/test/roles/postgresql @@ -146,7 +150,6 @@ use_dev_supervisor.txt .idea/* *.unison.tmp *.# -/tools/docker-compose/overrides/ /awx/ui_next/.ui-built /Dockerfile /_build/ -- cgit v1.2.3