WIP

somleng · Jun 27, 2024 · 1859619 · 1859619
1 parent 5e6cd39
commit 1859619
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 56 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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