Merge pull request #62 from torusresearch/develop

Release: fix lock issue
torusresearch · Jun 25, 2024 · 1ba3a42 · 1ba3a42
2 parents 6bd11c0 + 5b6eabe
commit 1ba3a42
Show file tree

Hide file tree

Showing 9 changed files with 1,750 additions and 948 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -72,8 +72,10 @@ jobs:
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA
           echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA"
       - name: Deploy
+        timeout-minutes: 10
         run: |
           aws ecs update-service --cluster $ECS_CLUSTER_METADATA --service $ECS_SERVICE_METADATA --force-new-deployment
+          aws ecs wait services-stable --cluster $ECS_CLUSTER_METADATA --service $ECS_SERVICE_METADATA
         env:
           ECS_CLUSTER_METADATA: lrc-microservices
           ECS_SERVICE_METADATA: torus-metadata-service
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -71,8 +71,10 @@ jobs:
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA
           echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA"
       - name: Deploy
+        timeout-minutes: 10
         run: |
           aws ecs update-service --cluster $ECS_CLUSTER_METADATA --service $ECS_SERVICE_METADATA --force-new-deployment
+          aws ecs wait services-stable --cluster $ECS_CLUSTER_METADATA --service $ECS_SERVICE_METADATA
         env:
           ECS_CLUSTER_METADATA: prod-microservices
           ECS_SERVICE_METADATA: torus-metadata-service
@@ -112,8 +114,10 @@ jobs:
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA
           echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA"
       - name: Deploy
+        timeout-minutes: 10
         run: |
           aws ecs update-service --cluster $ECS_CLUSTER_METADATA --service $ECS_SERVICE_METADATA --force-new-deployment
+          aws ecs wait services-stable --cluster $ECS_CLUSTER_METADATA --service $ECS_SERVICE_METADATA
         env:
           ECS_CLUSTER_METADATA: prod-microservices
           ECS_SERVICE_METADATA: torus-metadata-service
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   torus-metadata:
     restart: always
@@ -9,4 +7,4 @@ services:
     env_file:
       - ./.env
     ports:
-      - "5051:5051/tcp"
+      - "5051:5051/tcp"