Merge pull request #288 from silinternational/develop

Release 3.10.16 - allow underscores in tag names
silinternational · Jan 4, 2024 · 859686e · 859686e
2 parents f8fe971 + 907dcb7
commit 859686e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 23 deletions.
diff --git 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'
-```
+```
diff --git 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
diff --git 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
@@ -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:
@@ -252,7 +251,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

diff --git 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
+}