Btc integration env variable (#35)

* added envs and image visibility * added envs and image visibility * added image visibility
sygmaprotocol · Jun 11, 2024 · 943608e · 943608e
1 parent 607e6ee
commit 943608e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 22 deletions.
diff --git a/.github/workflows/deploy_ecs_STAGE_EXT.yml b/.github/workflows/deploy_ecs_STAGE_EXT.yml
@@ -15,6 +15,7 @@ env:
   TAG: "Demo"
   AWS_TESTNET: '${{ secrets.AWS_ARN }}'
   AWS_ROLE: '${{ secrets.AWS_ROLE_NAME }}'
+  IMAGE_VERSION: ''
 
 jobs:
   deploy:
@@ -44,7 +45,7 @@ jobs:
             awsRegion=${{ env.AWS_REGION }}
             relayerName=${{ env.PROJECT_NAME }}
             appTag=${{ env.TAG }}
-            env=STAGE
+            imageTag=${{ env.IMAGE_VERSION }}
 
       - name: configure aws credentials
         uses: aws-actions/configure-aws-credentials@v1

diff --git a/ecs/task_definition_PARTNERS.j2 b/ecs/task_definition_PARTNERS.j2
@@ -3,7 +3,7 @@
    "containerDefinitions": [ 
       { 
          "name": "{{ relayerName }}-{{ relayerId }}-container-{{ appTag }}",
-         "image": "ghcr.io/sygmaprotocol/sygma-relayer:stable",
+         "image": "ghcr.io/sygmaprotocol/sygma-relayer:{{ set Sygma release version }}",
          "portMappings": [ 
             { 
                "containerPort": 9000,
@@ -45,6 +45,18 @@
             {
                "name": "SYG_RELAYER_ENV",
                "value": {{ env }}
+            },
+            {
+               "name": "SYG_RELAYER_MPCCONFIG_KEYSHAREPATH",
+               "value": "/mount/r{{ relayerId }}.keyshare"
+            },
+            {
+               "name": "SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_PATH",
+               "value": "/mount/r{{ relayerId }}-top.json"
+            },
+            {
+               "name": "SYG_RELAYER_MPCCONFIG_FROSTKEYSHAREPATH",
+               "value": "/mount/r{{ relayerId }}-frost.keyshare"
             }
          ],
          "mountPoints": [
@@ -59,18 +71,10 @@
                "name": "SYG_RELAYER_MPCCONFIG_KEY",
                "valueFrom": "arn:aws:ssm:{{ awsRegion }}:{{ awsAccountId }}:parameter/chainbridge/relayers/relayer-{{ relayerId }}/SYG_RELAYER_MPCCONFIG_KEY"
             },
-            {
-               "name": "SYG_RELAYER_MPCCONFIG_KEYSHAREPATH",
-               "valueFrom": "arn:aws:ssm:{{ awsRegion }}:{{ awsAccountId }}:parameter/chainbridge/relayers/relayer-{{ relayerId }}/SYG_RELAYER_MPCCONFIG_KEYSHAREPATH"
-            },
             { 
                "name": "SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_ENCRYPTIONKEY",
                "valueFrom": "arn:aws:ssm:{{ awsRegion }}:{{ awsAccountId }}:parameter/chainbridge/relayers/relayer/SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_ENCRYPTIONKEY"
             },
-            {
-               "name": "SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_PATH",
-               "valueFrom": "arn:aws:ssm:{{ awsRegion }}:{{ awsAccountId }}:parameter/chainbridge/relayers/relayer-{{ relayerId }}/SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_PATH"
-            },
             {
                "name": "SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_URL",
                "valueFrom": "arn:aws:ssm:{{ awsRegion }}:{{ awsAccountId }}:parameter/chainbridge/relayers/relayer/SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_URL"
@@ -85,7 +89,7 @@
             "options": {
                "provider": "ecs",
                "dd_service": "{{ env }}-relayers-{{ relayerId }}",
-               "dd_tags": "env:{{ env }},project:chainbridge,relayerid:{{ relayerId }}",
+               "dd_tags": "env:{{ env }},project:chainbridge,relayerid:{{ relayerId }},image:{{ set Sygma release version }}",
                "dd_message_key": "log",
                "Host": "http-intake.logs.datadoghq.com",
                "TLS": "on",
@@ -224,7 +228,7 @@
       {
          "name": "efs",
          "efsVolumeConfiguration": {
-            "fileSystemId": "fs-0d2124b8842c39434",
+            "fileSystemId": "{{ set your fileSystemId here }}",
             "rootDirectory": "/",
             "transitEncryption": "ENABLED"
          }

diff --git a/ecs/task_definition_STAGE_EXT.j2 b/ecs/task_definition_STAGE_EXT.j2
@@ -3,7 +3,7 @@
    "containerDefinitions": [ 
       { 
          "name": "{{ relayerName }}-{{ relayerId }}-container-{{ appTag }}",
-         "image": "ghcr.io/sygmaprotocol/sygma-relayer:latest",
+         "image": "ghcr.io/sygmaprotocol/sygma-relayer:{{ imageTag }}",
          "portMappings": [ 
             { 
                "containerPort": 9000,
@@ -45,6 +45,18 @@
             {
                "name": "SYG_RELAYER_ENV",
                "value": {{ env }}
+            },
+                        {
+               "name": "SYG_RELAYER_MPCCONFIG_KEYSHAREPATH",
+               "value": "/mount/r{{ relayerId }}.keyshare"
+            },
+            {
+               "name": "SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_PATH",
+               "value": "/mount/r{{ relayerId }}-top.json"
+            },
+            {
+               "name": "SYG_RELAYER_MPCCONFIG_FROSTKEYSHAREPATH",
+               "value": "/mount/r{{ relayerId }}-frost.keyshare"
             }
          ],
          "mountPoints": [
@@ -59,18 +71,10 @@
                "name": "SYG_RELAYER_MPCCONFIG_KEY",
                "valueFrom": "arn:aws:ssm:{{ awsRegion }}:{{ awsAccountId }}:parameter/chainbridge/relayers/relayer-{{ relayerId }}/SYG_RELAYER_MPCCONFIG_KEY"
             },
-            {
-               "name": "SYG_RELAYER_MPCCONFIG_KEYSHAREPATH",
-               "valueFrom": "arn:aws:ssm:{{ awsRegion }}:{{ awsAccountId }}:parameter/chainbridge/relayers/relayer-{{ relayerId }}/SYG_RELAYER_MPCCONFIG_KEYSHAREPATH"
-            },
             { 
                "name": "SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_ENCRYPTIONKEY",
                "valueFrom": "arn:aws:ssm:{{ awsRegion }}:{{ awsAccountId }}:parameter/chainbridge/relayers/relayer/SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_ENCRYPTIONKEY"
             },
-            {
-               "name": "SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_PATH",
-               "valueFrom": "arn:aws:ssm:{{ awsRegion }}:{{ awsAccountId }}:parameter/chainbridge/relayers/relayer-{{ relayerId }}/SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_PATH"
-            },
             {
                "name": "SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_URL",
                "valueFrom": "arn:aws:ssm:{{ awsRegion }}:{{ awsAccountId }}:parameter/chainbridge/relayers/relayer/SYG_RELAYER_MPCCONFIG_TOPOLOGYCONFIGURATION_URL"
@@ -85,7 +89,7 @@
             "options": {
                "provider": "ecs",
                "dd_service": "DEVNET-relayers-{{ relayerId }}",
-               "dd_tags": "env:{{ env }},project:chainbridge,relayerid:{{ relayerId }}",
+               "dd_tags": "env:{{ env }},project:chainbridge,relayerid:{{ relayerId }},image:{{ imageTag }}",
                "dd_message_key": "log",
                "Host": "http-intake.logs.datadoghq.com",
                "TLS": "on",