- quoting paths

- extra debugging
raft-tech · Sep 6, 2024 · 0ad5e1c · 0ad5e1c
1 parent 7625f9a
commit 0ad5e1c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml
@@ -20,7 +20,7 @@
           command: |
             ls 
             pwd
-            ./scripts/build-and-tag-images.sh <<parameters.backend-appname>> <<parameters.frontend-appname>> $CIRCLE_WORKING_DIRECTORY/tdrs-backend $CIRCLE_WORKING_DIRECTORY/tdrs-frontend $CIRCLE_BUILD_NUM $CIRCLE_SHA1 $CIRCI_DOCKER_LOGIN tdp-circi
+            ./scripts/build-and-tag-images.sh <<parameters.backend-appname>> <<parameters.frontend-appname>> "$CIRCLE_WORKING_DIRECTORY/tdrs-backend" "$CIRCLE_WORKING_DIRECTORY/tdrs-frontend" $CIRCLE_BUILD_NUM $CIRCLE_SHA1 "$CIRCI_DOCKER_LOGIN" tdp-circi
 
   deploy-cloud-dot-gov:
     parameters:

diff --git a/scripts/build-and-tag-images.sh b/scripts/build-and-tag-images.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 if [ "$#" -ne 8  ]; then
     echo "Error, this script expects 8 parameters."
@@ -18,11 +19,14 @@ TAG="${BUILD_DATE}_build-${BUILD_NUM}_${COMMIT_HASH}"
 
 BUILD_DATE=`date +%F`
 
+ls $BACKEND_PATH
+ls $FRONTEND_PATH
+
 build_and_tag() {
     echo "$DOCKER_LOGIN" | docker login https://tdp-docker.dev.raftlabs.tech -u $DOCKER_USER --password-stdin
     for platform in "linux/amd64" "linux/arm64"; do
-        docker build --platform $platform -t tdp-docker.dev.raftlabs.tech/$BACKEND_APP_NAME:$TAG -t tdp-docker.dev.raftlabs.tech/$BACKEND_APP_NAME:latest $BACKEND_PATH
-        docker build --platform $platform -t tdp-docker.dev.raftlabs.tech/$FRONTEND_APP_NAME:$TAG -t tdp-docker.dev.raftlabs.tech/$FRONTEND_APP_NAME:latest $FRONTEND_PATH
+        docker build --platform $platform -t tdp-docker.dev.raftlabs.tech/$BACKEND_APP_NAME:$TAG -t tdp-docker.dev.raftlabs.tech/$BACKEND_APP_NAME:latest "$BACKEND_PATH"
+        docker build --platform $platform -t tdp-docker.dev.raftlabs.tech/$FRONTEND_APP_NAME:$TAG -t tdp-docker.dev.raftlabs.tech/$FRONTEND_APP_NAME:latest "$FRONTEND_PATH"
 
         docker push tdp-docker.dev.raftlabs.tech/$BACKEND_APP_NAME --all-tags
         docker push tdp-docker.dev.raftlabs.tech/$FRONTEND_APP_NAME --all-tags