External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'downstream/release_3.6.2' into downstream-changes

Browse Source
This commit is contained in:
Shane McDonald
2019-12-16 11:13:10 -05:00
parent 112f89660b cac3bece56
commit c1abc56753
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -663,7 +663,6 @@ docker-compose-build: awx-devel-build
# Base development image build # Base development image build
awx-devel-build: awx-devel-build:
docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile \ docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile \
--cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:devel \
--cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) . --cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) .
docker tag ansible/awx_devel $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) docker tag ansible/awx_devel $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
#docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) #docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)

1
awx/main/utils/encryption.py
View File

@@ -82,6 +82,7 @@ def encrypt_field(instance, field_name, ask=False, subfield=None, secret_key=Non
# symmetric key is based): # symmetric key is based):
# #
# $ awx-manage regenerate_secret_key # $ awx-manage regenerate_secret_key
# $ setup.sh -k
# #
# ...so you'll need to *also* add code to support the # ...so you'll need to *also* add code to support the
# migration/re-encryption of these values (the code in question lives in # migration/re-encryption of these values (the code in question lives in