diff --git a/Makefile b/Makefile index bcd6652..083aae5 100644 --- a/Makefile +++ b/Makefile @@ -5,14 +5,9 @@ build: dist/personal-measure-api.tar.gz dist/personal-measure-web.tar.gz clean: -rm -r dist - -rm api/personal_measure_api -rm -r web/dist - -dist/personal-measure-api.tar.gz: - -mkdir dist - make -C api personal_measure_api - tar czf dist/personal-measure-api-${VERSION}.tar.gz -C api personal_measure_api - cp dist/personal-measure-api-${VERSION}.tar.gz dist/personal-measure-api.tar.gz + -docker container prune + -docker image prune dist/personal-measure-web.tar.gz: -mkdir dist @@ -20,13 +15,9 @@ dist/personal-measure-web.tar.gz: tar czf dist/personal-measure-web-${VERSION}.tar.gz -C web/dist . cp dist/personal-measure-web-${VERSION}.tar.gz dist/personal-measure-web.tar.gz -#deploy-api: dist/personal-measure-api.tar.gz -# mkdir -p temp-deploy/personal-measure-api-${VERSION} -# tar xzf dist/personal-measure-api-${VERSION}.tar.gz -C temp-deploy/personal-measure-api-${VERSION} -# -ssh pmapi@pmapi.jdb-labs.com "sudo systemctl stop personal_measure_api.$(TARGET_ENV).service" -# scp temp-deploy/personal-measure-api-${VERSION}/personal_measure_api pmapi@pmapi.jdb-labs.com:/home/pmapi/$(TARGET_ENV)/personal_measure_api -# ssh pmapi@pmapi.jdb-labs.com "sudo systemctl start personal_measure_api.$(TARGET_ENV).service" -# rm -r temp-deploy +deploy-api: + make -C api personal_measure_api-image push-image + cd operations/terraform && terraform apply -target module.${TARGET_ENV}_env.aws_ecs_task_definition.pmapi -target module.${TARGET_ENV}_env.aws_ecs_service.pmapi deploy-web: dist/personal-measure-web.tar.gz mkdir -p temp-deploy/personal-measure-web-${VERSION}