Merge pull request #10 from fullfatthings/respect-other-containers

Only substitute images from the same respository

.github/workflows/update-background-service.yml

@@ -12,7 +12,8 @@ on:
       github-actions-role:
         required: true
         type: string
-      image:
+      images:
+        description: 'A semicolon separated list of images to update'
         required: true
         type: string
       service:
@@ -48,13 +49,19 @@ jobs:
           > task-definition.json
 
       - name: Render task definition
-        run: >
-          jq '.containerDefinitions[].image = "${{ steps.ecr-login.outputs.registry }}/${{ inputs.image }}"' task-definition.json
-          > new-task-definition.json
+        run: |
+          IFS=";" read -a IMAGES <<< "${{ inputs.images }}"
+          for image in "${IMAGES[@]}"
+          do
+            FULL_IMAGE="${{ steps.ecr-login.outputs.registry }}/$image"
+            REPOSITORY=${FULL_IMAGE%:*}
+            jq ".containerDefinitions[] |= if (.image | startswith(\"$REPOSITORY\")) then (.image = \"$FULL_IMAGE\") else . end" task-definition.json > new-task-definition.json
+            mv new-task-definition.json task-definition.json
+          done
 
       - name: Deploy task definition
         uses: fullfatthings/amazon-ecs-deploy-task-definition@master
         with:
-          task-definition: new-task-definition.json
+          task-definition: task-definition.json
           service: ${{ inputs.service }}
           cluster: ${{ inputs.cluster }}

.github/workflows/update-task-definition.yml

@@ -12,7 +12,8 @@ on:
       github-actions-role:
         required: true
         type: string
-      image:
+      images:
+        description: 'A semicolon separated list of images to update'
         required: true
         type: string
       task-definition-family:
@@ -45,12 +46,18 @@ jobs:
           > task-definition.json
 
       - name: Render task definition
-        run: >
-          jq '.containerDefinitions[].image = "${{ steps.ecr-login.outputs.registry }}/${{ inputs.image }}"' task-definition.json
-          > new-task-definition.json
+        run: |
+          IFS=";" read -a IMAGES <<< "${{ inputs.images }}"
+          for image in "${IMAGES[@]}"
+          do
+            FULL_IMAGE="${{ steps.ecr-login.outputs.registry }}/$image"
+            REPOSITORY=${FULL_IMAGE%:*}
+            jq ".containerDefinitions[] |= if (.image | startswith(\"$REPOSITORY\")) then (.image = \"$FULL_IMAGE\") else . end" task-definition.json > new-task-definition.json
+            mv new-task-definition.json task-definition.json
+          done
 
       - name: Deploy task definition
         uses: fullfatthings/amazon-ecs-deploy-task-definition@master
         with:
-          task-definition: new-task-definition.json
+          task-definition: task-definition.json
           cluster: ${{ inputs.cluster }}

.github/workflows/update-web-service.yml

@@ -12,7 +12,8 @@ on:
       github-actions-role:
         required: true
         type: string
-      image:
+      images:
+        description: 'A semicolon separated list of images to update'
         required: true
         type: string
       service:
@@ -48,14 +49,20 @@ jobs:
           > task-definition.json
 
       - name: Render task definition
-        run: >
-          jq '.containerDefinitions[].image = "${{ steps.ecr-login.outputs.registry }}/${{ inputs.image }}"' task-definition.json
-          > new-task-definition.json
+        run: |
+          IFS=";" read -a IMAGES <<< "${{ inputs.images }}"
+          for image in "${IMAGES[@]}"
+          do
+            FULL_IMAGE="${{ steps.ecr-login.outputs.registry }}/$image"
+            REPOSITORY=${FULL_IMAGE%:*}
+            jq ".containerDefinitions[] |= if (.image | startswith(\"$REPOSITORY\")) then (.image = \"$FULL_IMAGE\") else . end" task-definition.json > new-task-definition.json
+            mv new-task-definition.json task-definition.json
+          done
 
       - name: Deploy task definition
         uses: fullfatthings/amazon-ecs-deploy-task-definition@master
         with:
-          task-definition: new-task-definition.json
+          task-definition: task-definition.json
           service: ${{ inputs.service }}
           cluster: ${{ inputs.cluster }}
           wait-for-service-stability: true

README.md

@@ -90,8 +90,8 @@ Arguments:
 * `aws-region`: The AWS region the cluster resides in.
 * `cluster`: The name of the ECS cluster.
 * `github-actions-role`: The ARN of the above role.
-* `image`: The new ECR image to use. Should not include the *.amazonaws.com/
-prefix.
+* `images`: A semicolon-separated list of the new ECR images to use. Should not
+include the *.amazonaws.com/ prefix.
 * `service`: The name of the service to update to use the new task definition.
 * `task-definition-family`: Name of the task definition family.
 
@@ -106,8 +106,8 @@ Arguments:
 * `aws-region`: The AWS region the cluster resides in.
 * `cluster`: The name of the ECS cluster.
 * `github-actions-role`: The ARN of the above role.
-* `image`: The new ECR image to use. Should not include the *.amazonaws.com/
-prefix.
+* `images`: A semicolon-separated list of the new ECR images to use. Should not
+include the *.amazonaws.com/ prefix.
 * `task-definition-family`: Name of the task definition family.
 
 ## update-web-service.yml
@@ -122,7 +122,7 @@ Arguments:
 * `aws-region`: The AWS region the cluster resides in.
 * `cluster`: The name of the ECS cluster.
 * `github-actions-role`: The ARN of the above role.
-* `image`: The new ECR image to use. Should not include the *.amazonaws.com/
-prefix.
+* `images`: A semicolon-separated list of the new ECR images to use. Should not
+include the *.amazonaws.com/ prefix.
 * `service`: The name of the service to update to use the new task definition.
 * `task-definition-family`: Name of the task definition family.