Remove Docker commands for CF, clean up artifact creation

This commit is contained in:
bandesz
2017-02-28 12:31:56 +00:00
parent 95748a2eb9
commit d3b7d1aeee
3 changed files with 15 additions and 16 deletions

3
.gitignore vendored
View File

@@ -70,3 +70,6 @@ npm-debug.log
environment.sh environment.sh
.envrc .envrc
# CloudFoundry
.cf

View File

@@ -25,6 +25,8 @@ CODEDEPLOY_APP_NAME ?= notify-admin
CF_API ?= api.cloud.service.gov.uk CF_API ?= api.cloud.service.gov.uk
CF_ORG ?= govuk-notify CF_ORG ?= govuk-notify
CF_SPACE ?= ${DEPLOY_ENV} CF_SPACE ?= ${DEPLOY_ENV}
CF_HOME ?= ${HOME}
$(eval export CF_HOME)
.PHONY: help .PHONY: help
help: help:
@@ -226,11 +228,3 @@ cf-rollback: ## Rollbacks the app to the previous release
.PHONY: cf-push .PHONY: cf-push
cf-push: cf-push:
cf push -f manifest-${CF_SPACE}.yml cf push -f manifest-${CF_SPACE}.yml
.PHONY: cf-deploy-with-docker
cf-deploy-with-docker: prepare-docker-build-image ## Deploys the app to Cloud Foundry from a new Docker container
$(call run_docker_container,cf-deploy,make cf-login cf-deploy)
.PHONY: cf-rollback-with-docker
cf-rollback-with-docker: prepare-docker-build-image ## Rollbacks the app on Cloud Foundry to the previous version
$(call run_docker_container,cf-rollback,make cf-login cf-rollback)

View File

@@ -1,8 +1,10 @@
*__pycache__* __pycache__*
*.git* .git/*
*app/assets* app/assets/*
*bower_components* bower_components/*
*cache* cache/*
*node_modules* node_modules/*
*target* target/*
*venv* venv/*
.envrc
.cf/*