update terraform to provision endpoints - change docker script

podaac · Aug 6, 2023 · e7a1f25 · e7a1f25
1 parent 8d980c5
commit e7a1f25
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -203,7 +203,8 @@ jobs:
 
       - name: Build and deploy docker to ECR
         run: |
-          bash ./docker/build-docker.sh -n podaac-hydrocron -v "${{ env.THE_VERSION }}" >> env.DOCKER_TAG
+          echo "DOCKER_TAG=$(bash ./docker/build-docker.sh -n podaac-hydrocron -v '${{ env.THE_VERSION }}')" >> $GITHUB_ENV
+        #  bash ./docker/build-docker.sh -n podaac-hydrocron -v "${{ env.THE_VERSION }}"
           bash echo "----------"
           bash echo ${{ env.DOCKER_TAG }}
           bash ./docker/push-docker-ecr.sh --tf-venue "sit" --docker-tag ${{ env.DOCKER_TAG }}

diff --git a/docker/build-docker.sh b/docker/build-docker.sh
@@ -2,7 +2,7 @@
 
 # This script is intended to be run by the CI/CD pipeline to build a specific version of the Hydrocron API.
 
-#set -Eeo pipefail
+set -Eeo pipefail
 
 POSITIONAL=()
 while [[ $# -gt 0 ]]
@@ -56,5 +56,5 @@ dockerTagVersion=$(echo "${service_version}" | tr "+" _)
 
 tar_filename="${service_name}-${service_version}.tar.gz"
 docker build -t "${repositoryName}":"${dockerTagVersion}" --build-arg SOURCE="dist/${tar_filename}" -f "$SCRIPTPATH"/Dockerfile "$PROJECT_DIR" 1>&2
-echo "*******"
+
 echo "${repositoryName}":"${dockerTagVersion}"
diff --git a/docker/push-docker-ecr.sh b/docker/push-docker-ecr.sh
@@ -2,7 +2,7 @@
 
 # This script is intended to be run by the CI/CD pipeline to push a docker tag previously built by build-docker.sh
 
-#set -Eeo pipefail
+set -Eeo pipefail
 
 POSITIONAL=()
 while [[ $# -gt 0 ]]