mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-19 14:09:20 -04:00
Write manifests to disk instead of redirecting
Some time between version 6.32 and 6.34 of the Cloudfoundry CLI the ability to redirect the output of a command into `cf push -f` was broken. The only alternative we can think of is writing the file to disk, doing the deploy, and then deleting it. We’re careful to write to a directory outside the current repo to avoid: - including secrets in the deployed package - accidentally checking the secrets into source control `/tmp/` seems to be a good place to put it, since, even if the delete doesn’t run, it will get cleaned up eventually (probably when the machine next boots). Right now this only applies to people deploying from their local machines. At some point it will affect Jenkins too, but isn’t now. So this commit only fixes the problem for the commands that developers run locally. fixup! Write manifests to disk instead of redirecting
This commit is contained in:
8
Makefile
8
Makefile
@@ -192,12 +192,16 @@ cf-deploy: ## Deploys the app to Cloud Foundry
|
||||
.PHONY: cf-deploy-prototype
|
||||
cf-deploy-prototype: cf-target ## Deploys the app to Cloud Foundry
|
||||
$(if ${CF_SPACE},,$(error Must specify CF_SPACE))
|
||||
cf push -f <(make -s CF_MANIFEST_FILE=manifest-prototype-${CF_SPACE}.yml generate-manifest)
|
||||
(make -s CF_MANIFEST_FILE=manifest-prototype-${CF_SPACE}.yml generate-manifest) > /tmp/admin_manifest.yml
|
||||
cf push -f /tmp/admin_manifest.yml
|
||||
rm /tmp/admin_manifest.yml
|
||||
|
||||
.PHONY: cf-deploy-prototype-2
|
||||
cf-deploy-prototype-2: cf-target ## Deploys the app to Cloud Foundry
|
||||
$(if ${CF_SPACE},,$(error Must specify CF_SPACE))
|
||||
cf push -f <(make -s CF_MANIFEST_FILE=manifest-prototype-2-${CF_SPACE}.yml generate-manifest)
|
||||
(make -s CF_MANIFEST_FILE=manifest-prototype-2-${CF_SPACE}.yml generate-manifest) > /tmp/admin_manifest.yml
|
||||
cf push -f /tmp/admin_manifest.yml
|
||||
rm /tmp/admin_manifest.yml
|
||||
|
||||
.PHONY: cf-rollback
|
||||
cf-rollback: ## Rollbacks the app to the previous release
|
||||
|
||||
Reference in New Issue
Block a user