diff options
| author | John Westcott IV <john.westcott.iv@redhat.com> | 2023-06-27 00:18:57 +0200 |
|---|---|---|
| committer | John Westcott IV <32551173+john-westcott-iv@users.noreply.github.com> | 2023-06-30 16:05:15 +0200 |
| commit | 94183d602cdc0bce253bc5c48280f021f2b2e4e8 (patch) | |
| tree | 36a0c6cc4ad44cc935772b988ec9ce1f35cdd41f /Makefile | |
| parent | Fix filter experience when assigning access to teams (#14175) (diff) | |
| download | awx-94183d602cdc0bce253bc5c48280f021f2b2e4e8.tar.xz awx-94183d602cdc0bce253bc5c48280f021f2b2e4e8.zip | |
Enhancing vault integration
Added persistent storage
Auto-create vault and awx via playbooks
Create a new pattern for custom containers where we can do initialization
Auto-install roles needed for plumbing via the Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -532,6 +532,9 @@ docker-compose-sources: .git/hooks/pre-commit $(EXTRA_SOURCES_ANSIBLE_OPTS) docker-compose: awx/projects docker-compose-sources + ansible-galaxy install --ignore-certs -r tools/docker-compose/ansible/requirements.yml; + ansible-playbook -i tools/docker-compose/inventory tools/docker-compose/ansible/initialize_containers.yml \ + -e enable_vault=$(VAULT); $(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml $(COMPOSE_OPTS) up $(COMPOSE_UP_OPTS) --remove-orphans docker-compose-credential-plugins: awx/projects docker-compose-sources @@ -583,7 +586,7 @@ docker-clean: -$(foreach image_id,$(shell docker images --filter=reference='*/*/*awx_devel*' --filter=reference='*/*awx_devel*' --filter=reference='*awx_devel*' -aq),docker rmi --force $(image_id);) docker-clean-volumes: docker-compose-clean docker-compose-container-group-clean - docker volume rm -f tools_awx_db tools_grafana_storage tools_prometheus_storage $(docker volume ls --filter name=tools_redis_socket_ -q) + docker volume rm -f tools_awx_db tools_vault_1 tools_grafana_storage tools_prometheus_storage $(docker volume ls --filter name=tools_redis_socket_ -q) docker-refresh: docker-clean docker-compose |