From 185961968af1790e35740de32a8169e2c19f4e4e Mon Sep 17 00:00:00 2001 From: David Wilkie Date: Thu, 27 Jun 2024 11:43:23 +0700 Subject: [PATCH] WIP --- .github/workflows/switch.yml | 6 +- components/freeswitch/Dockerfile | 2 +- docker-compose.yml | 2 + .../modules/somleng_switch/switch.tf | 2 - .../modules/somleng_switch/versions.tf | 5 +- infrastructure/staging/.terraform.lock.hcl | 77 ++++++++----------- 6 files changed, 38 insertions(+), 56 deletions(-) diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml index c6ff25095..ffacebb47 100644 --- a/.github/workflows/switch.yml +++ b/.github/workflows/switch.yml @@ -158,7 +158,7 @@ jobs: build-args: signalwire_token=${{ secrets.SIGNALWIRE_TOKEN }} push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 cache-from: type=gha,scope=${{ matrix.identifier }}-freeswitch cache-to: type=gha,mode=max,scope=${{ matrix.identifier }}-freeswitch tags: | @@ -171,7 +171,7 @@ jobs: with: context: components/freeswitch_event_logger push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 cache-from: type=gha,scope=${{ matrix.identifier }}-freeswitch-event-logger cache-to: type=gha,mode=max,scope=${{ matrix.identifier }}-freeswitch-event-logger tags: | @@ -184,7 +184,7 @@ jobs: with: context: components/app push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 cache-from: type=gha,scope=${{ matrix.identifier }} cache-to: type=gha,mode=max,scope=${{ matrix.identifier }} tags: | diff --git a/components/freeswitch/Dockerfile b/components/freeswitch/Dockerfile index d9d4b7013..0dc3895f2 100644 --- a/components/freeswitch/Dockerfile +++ b/components/freeswitch/Dockerfile @@ -21,7 +21,7 @@ RUN cmake .. RUN make RUN make install -FROM public.ecr.aws/aws-cli/aws-cli:latest as aws-cli +FROM public.ecr.aws/aws-cli/aws-cli as aws-cli FROM public.ecr.aws/docker/library/debian:bookworm-slim diff --git a/docker-compose.yml b/docker-compose.yml index 8c554725b..faa65ff45 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -91,6 +91,7 @@ services: build: context: components/freeswitch image: freeswitch:latest + platform: linux/amd64 extra_hosts: - "host.docker.internal:host-gateway" environment: @@ -127,6 +128,7 @@ services: build: context: components/app image: switch-app:latest + platform: linux/amd64 depends_on: redis: condition: service_healthy diff --git a/infrastructure/modules/somleng_switch/switch.tf b/infrastructure/modules/somleng_switch/switch.tf index 0afb8e99a..2c8eb3bfe 100644 --- a/infrastructure/modules/somleng_switch/switch.tf +++ b/infrastructure/modules/somleng_switch/switch.tf @@ -9,8 +9,6 @@ module "switch_container_instances" { app_identifier = var.switch_identifier vpc = var.vpc - architecture = "arm64" - instance_type = "t4g.small" instance_subnets = var.vpc.private_subnets cluster_name = aws_ecs_cluster.cluster.name max_capacity = var.switch_max_tasks * 2 diff --git a/infrastructure/modules/somleng_switch/versions.tf b/infrastructure/modules/somleng_switch/versions.tf index 6dfd0944f..397d09a2a 100644 --- a/infrastructure/modules/somleng_switch/versions.tf +++ b/infrastructure/modules/somleng_switch/versions.tf @@ -6,14 +6,11 @@ terraform { local = { source = "hashicorp/local" } - template = { - source = "hashicorp/template" - } tls = { source = "hashicorp/tls" } docker = { - source = "kreuzwerker/docker" + source = "kreuzwerker/docker" } } required_version = ">= 0.13" diff --git a/infrastructure/staging/.terraform.lock.hcl b/infrastructure/staging/.terraform.lock.hcl index bbdb8fa0f..5256edf28 100644 --- a/infrastructure/staging/.terraform.lock.hcl +++ b/infrastructure/staging/.terraform.lock.hcl @@ -2,60 +2,43 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.37.0" + version = "5.55.0" hashes = [ - "h1:CQeYyWigNz838zjXKYH9VDkpjqlGB0phcM742YXiNh4=", - "zh:00f40a3d9593476693a7a72d993fd289f7be374fe3f2799776c6296eb6ff890a", - "zh:1010a9fbf55852a8da3473de4ec0f1fcf29efa85d66f61cbe2b086dbbd7747ae", - "zh:103a5674d1eb1cff05fe35e9baa9875afd18d740868b63f9c0c25eadb5eb4eb7", - "zh:270ac1b7a1327c1456a43df44c0b5cc3e26ed6d8861a709adeea1da684a563f5", - "zh:424362c02c8917c0586f3dd49aca27b7e0c21f5a23374b7045e9be3b5646c028", - "zh:549fa2ea187964ab9a0c354310947ead30e09b3199db1ff377c21d7547d78299", - "zh:6492d2ccc7f7d60e83cd8b7244adc53f30efc17d84b1ffc1b8fd6c385f8255fd", - "zh:66fb7b3b8a357071d26c5996c16d426edf07502a05ac86f4a6f73646ee7d1bbb", - "zh:6ecc05fb466d06ea8945564d2cdb8c2a8827d8cfca1550e9fb7eac0e95920196", - "zh:7932360b627b211dad937d278a8692a6c52bd6c0a71e4ec9e94ccbe825053822", - "zh:97ed1b4a18842c4d56a735329e87b4ef91a47e820e5a5c3c2dd64e293408bfc8", + "h1:vChl08zNYLVzuSzfxz3wp3wNSx+vjwl/jPuyPbg59Ks=", + "zh:06fbb1cc4b61b9d6370d391bf7538aa6ef8b60b91c67d125a6be60a70b1d49f0", + "zh:1d52acd2184f379433a0fce2c29d5ed8fc7958d6a9d1b403310dcc36b2a3f626", + "zh:290bbce092f8836a1db530ac86d933cfea27d52b827639974a81bc48dfba8c34", + "zh:3531f2822c2de3ba837381c4ee4816c5b437fd204c07d659526a04d9154a65e8", + "zh:56d70db4c8c6c0ec1b665380b87726275f4ab3665b4b78ac86dc90e1010c0fe3", + "zh:8251d713c0b2c8c51b6858e51c70d083b484342ff9782a88c39e7eaa966c3da2", + "zh:9a7d1f7207e51382a7dd139dfd5786e7e905edf9bf89bbee4b59ad41365e87be", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:d5e022052011e1984b9c2f8bc5a6b05c909e3b5bf40c3baddf191bf90e3169c2", - "zh:d7e9488b2ce5904efb91c8577b3fe9b0cd599c4cd508f1f163f292930f54fdf0", - "zh:e57cd93d5cd81dd0f446076af6e47a53ce83df2947ec64ed39a1090d4bdf8f0b", + "zh:a529c78dfc60063289524690af78794e99a768835b88e27cdfec15bc85439f7c", + "zh:b6da1843355db05c5d412126406fd97db2a6ff9edc166b81c1cea2994535b4eb", + "zh:bfc08cd23b1556b3287d1b28ac7f12c7d459471d97a0592bf2579ea68d11bae7", + "zh:c382088faf05894191636b57861069a21de10a5ff4eb8f7cc122e764ccf7a4a8", + "zh:e27f99f389921314ee428b24990d3a829057ce532b2beb33c69387458722edd9", + "zh:ef11285eedb45ffc3fb2ecdfefa206e64eb2760a87fff15c44dee42de9703436", + "zh:fedc4ebee0d6fe196691127004db5d1ff8bd22e3b667a74026bb92c607589b6c", ] } provider "registry.terraform.io/hashicorp/local" { - version = "2.4.1" + version = "2.5.1" hashes = [ - "h1:V2G4qygMV0uHy+QTMlrjSyYgzpYmYyB6gWuE09+5CPI=", - "zh:244b445bf34ddbd167731cc6c6b95bbed231dc4493f8cc34bd6850cfe1f78528", - "zh:3c330bdb626123228a0d1b1daa6c741b4d5d484ab1c7ae5d2f48d4c9885cc5e9", - "zh:5ff5f9b791ddd7557e815449173f2db38d338e674d2d91800ac6e6d808de1d1d", - "zh:70206147104f4bf26ae67d730c995772f85bf23e28c2c2e7612c74f4dae3c46f", - "zh:75029676993accd6bef933c196b2fad51a9ec8a69a847dbbe96ec8ebf7926cdc", + "h1:/GAVA/xheGQcbOZEq0qxANOg+KVLCA7Wv8qluxhTjhU=", + "zh:0af29ce2b7b5712319bf6424cb58d13b852bf9a777011a545fac99c7fdcdf561", + "zh:126063ea0d79dad1f68fa4e4d556793c0108ce278034f101d1dbbb2463924561", + "zh:196bfb49086f22fd4db46033e01655b0e5e036a5582d250412cc690fa7995de5", + "zh:37c92ec084d059d37d6cffdb683ccf68e3a5f8d2eb69dd73c8e43ad003ef8d24", + "zh:4269f01a98513651ad66763c16b268f4c2da76cc892ccfd54b401fff6cc11667", + "zh:51904350b9c728f963eef0c28f1d43e73d010333133eb7f30999a8fb6a0cc3d8", + "zh:73a66611359b83d0c3fcba2984610273f7954002febb8a57242bbb86d967b635", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:7d48d5999fe1fcdae9295a7c3448ac1541f5a24c474bd82df6d4fa3732483f2b", - "zh:b766b38b027f0f84028244d1c2f990431a37d4fc3ac645962924554016507e77", - "zh:bfc7ad301dada204cf51c59d8bd6a9a87de5fddb42190b4d6ba157d6e08a1f10", - "zh:c902b527702a8c5e2c25a6637d07bbb1690cb6c1e63917a5f6dc460efd18d43f", - "zh:d68ae0e1070cf429c46586bc87580c3ed113f76241da2b6e4f1a8348126b3c46", - "zh:f4903fd89f7c92a346ae9e666c2d0b6884c4474ae109e9b4bd15e7efaa4bfc29", - ] -} - -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - hashes = [ - "h1:0wlehNaxBX7GJQnPfQwTNvvAf38Jm0Nv7ssKGMaG6Og=", - "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386", - "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53", - "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603", - "zh:0e3a6c8e16f17f19010accd0844187d524580d9fdb0731f675ffcf4afba03d16", - "zh:45f2c594b6f2f34ea663704cc72048b212fe7d16fb4cfd959365fa997228a776", - "zh:77ea3e5a0446784d77114b5e851c970a3dde1e08fa6de38210b8385d7605d451", - "zh:8a154388f3708e3df5a69122a23bdfaf760a523788a5081976b3d5616f7d30ae", - "zh:992843002f2db5a11e626b3fc23dc0c87ad3729b3b3cff08e32ffb3df97edbde", - "zh:ad906f4cebd3ec5e43d5cd6dc8f4c5c9cc3b33d2243c89c5fc18f97f7277b51d", - "zh:c979425ddb256511137ecd093e23283234da0154b7fa8b21c2687182d9aea8b2", + "zh:7ae387993a92bcc379063229b3cce8af7eaf082dd9306598fcd42352994d2de0", + "zh:9e0f365f807b088646db6e4a8d4b188129d9ebdbcf2568c8ab33bddd1b82c867", + "zh:b5263acbd8ae51c9cbffa79743fbcadcb7908057c87eb22fd9048268056efbc4", + "zh:dfcd88ac5f13c0d04e24be00b686d069b4879cc4add1b7b1a8ae545783d97520", ] } @@ -63,6 +46,7 @@ provider "registry.terraform.io/hashicorp/tls" { version = "4.0.5" hashes = [ "h1:yLqz+skP3+EbU3yyvw8JqzflQTKDQGsC9QyZAg+S4dg=", + "h1:zeG5RmggBZW/8JWIVrdaeSJa0OG62uFX5HY1eE8SjzY=", "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", @@ -81,6 +65,7 @@ provider "registry.terraform.io/hashicorp/tls" { provider "registry.terraform.io/kreuzwerker/docker" { version = "3.0.2" hashes = [ + "h1:XjdpVL61KtTsuPE8swok3GY8A+Bu3TZs8T2DOEpyiXo=", "h1:os8pBi4rbtFJJtzNWlcGhOVsz5V9UPJvo+L0wNQFYE8=", "zh:15b0a2b2b563d8d40f62f83057d91acb02cd0096f207488d8b4298a59203d64f", "zh:23d919de139f7cd5ebfd2ff1b94e6d9913f0977fcfc2ca02e1573be53e269f95",