From 1574d520aad58128efb7b62d13080f916a0d1057 Mon Sep 17 00:00:00 2001
From: ceineke <chris@greenfieldlabs.ca>
Date: Tue, 28 Jan 2020 11:10:08 -0500
Subject: [PATCH 1/6] Allow underscores in repository names.

---
 ecs-deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs-deploy b/ecs-deploy
index 3f9b74a..c27dfe3 100755
--- a/ecs-deploy
+++ b/ecs-deploy
@@ -213,7 +213,7 @@ function parseImageName() {
       fi
     else
       # check if using root level repo with format like mariadb or mariadb:latest
-      rootRepoRegex="^([a-zA-Z0-9\-]+):?([a-zA-Z0-9\.\-]+)?$"
+      rootRepoRegex="^([a-zA-Z0-9\-]+):?([a-zA-Z0-9\.\-_]+)?$"
       if [[ $IMAGE =~ $rootRepoRegex ]]; then
         img=${BASH_REMATCH[1]}
         if [[ "x$img" == "x" ]]; then

From c3493aa99959d5ffe9e8d8b6be13b60068c6c3b7 Mon Sep 17 00:00:00 2001
From: Devon <122382412+devon-sil@users.noreply.github.com>
Date: Mon, 18 Dec 2023 15:45:19 -0500
Subject: [PATCH 2/6] Remove silintl/mariadb from command example

We no longer use silintl/mariadb, we use mariadb images directly.
---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 58ebdbb..b44564d 100644
--- a/README.md
+++ b/README.md
@@ -29,8 +29,7 @@ Usage
         -n | --service-name           Name of service to deploy
         -i | --image                  Name of Docker image to run, ex: repo/image:latest
                                       Format: [domain][:port][/repo][/][image][:tag]
-                                      Examples: mariadb, mariadb:latest, silintl/mariadb,
-                                                silintl/mariadb:latest, private.registry.com:8000/repo/image:tag
+                                      Examples: mariadb, mariadb:latest, private.registry.com:8000/repo/image:tag
 
     Optional arguments:
         -a | --aws-assume-role        ARN for AWS Role to assume for ecs-deploy operations.
@@ -261,4 +260,4 @@ deploy_to_ecs:
       service_name: 'aws-service-name'
       timeout_cmd: '--timeout'
       timeout: '360'
-```
\ No newline at end of file
+```

From 895bc750b973a3d738fb1ecaf4e8bfc0ae299423 Mon Sep 17 00:00:00 2001
From: Devon <122382412+devon-sil@users.noreply.github.com>
Date: Mon, 18 Dec 2023 15:46:07 -0500
Subject: [PATCH 3/6] Remove silintl/mariadb example from ecs-deploy

We use mariadb directly now.
---
 ecs-deploy | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ecs-deploy b/ecs-deploy
index 7c7e3b8..abcfa47 100755
--- a/ecs-deploy
+++ b/ecs-deploy
@@ -47,8 +47,7 @@ Required arguments:
     -c | --cluster               Name of ECS cluster
     -i | --image                 Name of Docker image to run, ex: repo/image:latest
                                  Format: [domain][:port][/repo][/][image][:tag]
-                                 Examples: mariadb, mariadb:latest, silintl/mariadb,
-                                           silintl/mariadb:latest, private.registry.com:8000/repo/image:tag
+                                 Examples: mariadb, mariadb:latest, private.registry.com:8000/repo/image:tag
     --aws-instance-profile       Use the IAM role associated with this instance
 
 Optional arguments:

From ec5447da51ea879962d30259e2a9a1bc06b3ba25 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:21:23 -0700
Subject: [PATCH 4/6] add tests for using an underscore in tag name

---
 test.bats | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test.bats b/test.bats
index deeb86d..698daf8 100755
--- a/test.bats
+++ b/test.bats
@@ -670,3 +670,19 @@ EOF
   [ ! -z $status ]
   [ "$(echo "$output" | jq .)" == "$(echo "$expected" | jq .)" ]
 }
+
+@test "test parseImageName using image starting with underscore" {
+  IMAGE="_something:tag123"
+  TAGVAR=false
+  run parseImageName
+  [ $status -eq 13 ]
+}
+
+@test "test parseImageName using image containing an underscore in tag name" {
+  IMAGE="something:tag_123"
+  TAGVAR=false
+  run parseImageName
+  [ ! -z $status ]
+  [ "$output" == "something:tag_123" ]
+  echo "output = $output" 1>&2
+}

From 8766383d7b676fca3faa0ee4f159e2f0aa90caef Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:21:40 -0700
Subject: [PATCH 5/6] add 'services' at top of docker-compose.yml

---
 docker-compose.yml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1faa067..4206559 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,18 @@
-ecsdeploy:
-    build: .
-    env_file:
-        - local.env
-    volumes:
-        - ./ecs-deploy:/ecs-deploy
+services:
+    ecsdeploy:
+        build: .
+        env_file:
+            - local.env
+        volumes:
+            - ./ecs-deploy:/ecs-deploy
 
-test:
-    build: .
-    env_file:
-        - local.env
-    entrypoint: ["bash"]
-    command: ["/run-tests.sh"]
-    volumes:
-        - ./ecs-deploy:/ecs-deploy
-        - ./run-tests.sh:/run-tests.sh
-        - ./test.bats:/test.bats
+    test:
+        build: .
+        env_file:
+            - local.env
+        entrypoint: ["bash"]
+        command: ["/run-tests.sh"]
+        volumes:
+            - ./ecs-deploy:/ecs-deploy
+            - ./run-tests.sh:/run-tests.sh
+            - ./test.bats:/test.bats

From 907dcb738ab467dc4cf7bcedb2d6601c006a9eca Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:23:50 -0700
Subject: [PATCH 6/6] update version to 3.10.16

---
 ecs-deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecs-deploy b/ecs-deploy
index 750ddc6..39338f1 100755
--- a/ecs-deploy
+++ b/ecs-deploy
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Setup default values for variables
-VERSION="3.10.15"
+VERSION="3.10.16"
 CLUSTER=false
 SERVICE=false
 TASK_DEFINITION=false