Refactor to support AWS ECR

build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-source version.sh
+source config.sh
 
-docker build -t pigz:${version} .
+docker build -t ${image_name}:${version} .

config.sh

@@ -0,0 +1,9 @@
+version="2.4"
+
+# docker related
+registry="583643567512.dkr.ecr.us-east-1.amazonaws.com"
+image_name="pigz"
+
+# set this to 1 if you want to create a repository in AWS ECR
+# set this to 0 for Docker Hub
+create_ecr_repo=1

package-for-cromwell.sh

@@ -1,8 +1,8 @@
-#!/bin/bash -e
+#!/bin/bash
 
-hub="hisplan"
-image_name="cromwell-pigz"
-version="2.4"
+source config.sh
+
+image_name="cromwell-${image_name}"
 
 echo "Building ${image_name}:${version}..."
 
@@ -17,12 +17,20 @@ cat Dockerfile.cromwell
 # build it
 docker build -t ${image_name}:${version} -f Dockerfile.cromwell .
 
-echo "Packaging ${hub}/${image_name}:${version}..."
+echo "Packaging ${registry}/${image_name}:${version}..."
 
 #
 # tag it and push it to docker hub
 #
 
-docker login
-docker tag ${image_name}:${version} ${hub}/${image_name}:${version}
-docker push ${hub}/${image_name}:${version}
+docker tag ${image_name}:${version} ${registry}/${image_name}:${version}
+if [ $create_ecr_repo == 1 ]
+then
+    # only create if not exist
+    aws ecr describe-repositories --repository-name ${image_name} 2> /dev/null
+    if [ $? != 0 ]
+    then
+        aws ecr create-repository --repository-name ${image_name}
+    fi
+fi
+docker push ${registry}/${image_name}:${version}

package.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+source config.sh
+
+echo "${registry}/${image_name}:${version}"
+
+docker tag ${image_name}:${version} ${registry}/${image_name}:${version}
+if [ $create_ecr_repo == 1 ]
+then
+    # only create if not exist
+    aws ecr describe-repositories --repository-name ${image_name} 2> /dev/null
+    if [ $? != 0 ]
+    then
+        aws ecr create-repository --repository-name ${image_name}
+    fi
+fi
+docker push ${registry}/${image_name}:${version}