photowall/api2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rightsize ecs

Browse Source
This commit is contained in:
Niklas Fondberg
2020-06-09 16:28:17 +02:00
parent 2ebfec0f8f
commit a635623b87
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cloudformation/Makefile
+4 -4
View File
@@ -26,14 +26,14 @@ ifeq ($(ENVIRONMENT_NAME),production)
GITHUB_BRANCH=master GITHUB_BRANCH=master
DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION) DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION)
CPU_SIZE=1024 CPU_SIZE=1024
MEMORY_SIZE=4GB MEMORY_SIZE=2GB
BERNARD_SQS_POLICY=arn:aws:iam::954747537408:policy/pw-publish-photowall-bernard-live-queue BERNARD_SQS_POLICY=arn:aws:iam::954747537408:policy/pw-publish-photowall-bernard-live-queue
else else
SUBDOMAIN=$(STACK_NAME)-$(ENVIRONMENT_NAME) SUBDOMAIN=$(STACK_NAME)-$(ENVIRONMENT_NAME)
GITHUB_BRANCH=$(ENVIRONMENT_NAME) GITHUB_BRANCH=$(ENVIRONMENT_NAME)
DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_STAGING) DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_STAGING)
CPU_SIZE=512 CPU_SIZE=256
MEMORY_SIZE=2GB MEMORY_SIZE=1GB
BERNARD_SQS_POLICY=arn:aws:iam::954747537408:policy/pw-publish-photowall-bernard-stage-queue BERNARD_SQS_POLICY=arn:aws:iam::954747537408:policy/pw-publish-photowall-bernard-stage-queue
endif endif
@@ -47,7 +47,7 @@ check-create-initial-ecr-image:
echo "ECR Repo for initial image does not exist, creating"; \ echo "ECR Repo for initial image does not exist, creating"; \
echo ""; \ echo ""; \
aws ecr create-repository --repository $(STACK_NAME)-$(ENVIRONMENT_NAME); \ aws ecr create-repository --repository $(STACK_NAME)-$(ENVIRONMENT_NAME); \
$$(aws ecr get-login --no-include-email --region eu-west-1); \ docker login -u AWS -p $(shell aws ecr get-login-password --region eu-west-1) $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(STACK_NAME)-$(ENVIRONMENT_NAME); \
docker pull nginx; \ docker pull nginx; \
docker tag nginx $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(STACK_NAME)-$(ENVIRONMENT_NAME):latest; \ docker tag nginx $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(STACK_NAME)-$(ENVIRONMENT_NAME):latest; \
docker push $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(STACK_NAME)-$(ENVIRONMENT_NAME):latest; \ docker push $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(STACK_NAME)-$(ENVIRONMENT_NAME):latest; \