Skip to content

Commit 0613759

Browse files
new code
1 parent 3895529 commit 0613759

File tree

7 files changed

+189
-115
lines changed

7 files changed

+189
-115
lines changed

devops/cleanup.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
# Safety destroy
44
./destroy.sh
55

6+
# Delete ECR
7+
aws ecr delete-repository \
8+
--repository-name tilelens/backend \
9+
--region ap-southeast-2 \
10+
--force \
11+
--no-cli-pager \
12+
13+
aws ecr delete-repository \
14+
--repository-name tilelens/transcriber \
15+
--region ap-southeast-2 \
16+
--force \
17+
--no-cli-pager
18+
619
# Delete terraform state bucket
720
aws s3 rb s3://tilelens-terraform --force --region ap-southeast-2
821

devops/deploy.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,19 @@ aws ecr get-login-password --region ap-southeast-2 | \
55
docker login --username AWS --password-stdin 058264550947.dkr.ecr.ap-southeast-2.amazonaws.com
66

77
# Build Docker image ( Very important if build from Mac M chip)
8-
docker buildx build --platform linux/amd64 -f ../backend/Dockerfile.prod -t tilelens ../backend --load
8+
docker buildx build --platform linux/amd64 -f ../backend/Dockerfile.prod -t tilelens/backend ../backend --load
9+
docker tag tilelens/backend:latest 058264550947.dkr.ecr.ap-southeast-2.amazonaws.com/tilelens/backend:latest
10+
docker push 058264550947.dkr.ecr.ap-southeast-2.amazonaws.com/tilelens/backend:latest
911

10-
# Tag and push
11-
docker tag tilelens:latest 058264550947.dkr.ecr.ap-southeast-2.amazonaws.com/tilelens:latest
12-
docker push 058264550947.dkr.ecr.ap-southeast-2.amazonaws.com/tilelens:latest
12+
docker buildx build --platform linux/amd64 -f ../worker/transcriber/Dockerfile -t tilelens/transcriber ../worker/transcriber --load
13+
docker tag tilelens/transcriber:latest 058264550947.dkr.ecr.ap-southeast-2.amazonaws.com/tilelens/transcriber:latest
14+
docker push 058264550947.dkr.ecr.ap-southeast-2.amazonaws.com/tilelens/transcriber:latest
1315

1416
# Build and Zip Lambdas
15-
cd ../worker/clipping_image/
17+
cd ../worker/msk_topic_creator/
18+
./build.sh
19+
20+
cd ../clipping_image/
1621
./build.sh
1722

1823
cd ../tiling_image/
@@ -29,4 +34,4 @@ cd ../devops
2934
terraform init
3035
terraform apply -auto-approve
3136

32-
aws s3 sync ../frontend/dist s3://tilelens-frontend --delete
37+
aws s3 sync ../frontend/dist s3://tilelens-frontend --delete

devops/init.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
#!/bin/bash
22

3+
# Create ECR
4+
aws ecr create-repository \
5+
--repository-name tilelens/backend \
6+
--region ap-southeast-2 \
7+
--no-cli-pager
8+
9+
aws ecr create-repository \
10+
--repository-name tilelens/transcriber \
11+
--region ap-southeast-2 \
12+
--no-cli-pager
13+
314
# Create Terraform bucket
415
aws s3 mb s3://tilelens-terraform --region ap-southeast-2
516

devops/main.tf

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -286,16 +286,16 @@ module "route53" {
286286
depends_on = [module.cdn, module.alb]
287287
}
288288

289-
module "pipeline" {
290-
source = "./modules/pipeline"
291-
292-
project_name = var.project_name
293-
aws_region = var.aws_region
294-
frontend_bucket_arn = module.s3.frontend_bucket_arn
295-
frontend_bucket_name = module.s3.frontend_bucket
296-
tiling_lambda_name = module.lambda.tiling_lambda_name
297-
clipping_lambda_name = module.lambda.clipping_lambda_name
298-
blending_lambda_name = module.lambda.blending_lambda_name
299-
backend_ecs_cluster_name = module.ecs.backend_ecs_cluster_name
300-
backend_ecs_service_name = module.ecs.backend_ecs_service_name
301-
}
289+
# module "pipeline" {
290+
# source = "./modules/pipeline"
291+
292+
# project_name = var.project_name
293+
# aws_region = var.aws_region
294+
# frontend_bucket_arn = module.s3.frontend_bucket_arn
295+
# frontend_bucket_name = module.s3.frontend_bucket
296+
# tiling_lambda_name = module.lambda.tiling_lambda_name
297+
# clipping_lambda_name = module.lambda.clipping_lambda_name
298+
# blending_lambda_name = module.lambda.blending_lambda_name
299+
# backend_ecs_cluster_name = module.ecs.backend_ecs_cluster_name
300+
# backend_ecs_service_name = module.ecs.backend_ecs_service_name
301+
# }

devops/modules/messaging/msk/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
resource "aws_msk_cluster" "cluster" {
22
cluster_name = "${var.project_name}-msk-cluster"
3-
kafka_version = "2.8.1"
3+
kafka_version = "3.8.x"
44
number_of_broker_nodes = 2
55

66
broker_node_group_info {

0 commit comments

Comments
 (0)