From 61d37c5a211a56ad1f355b95f88eee1f29297dd3 Mon Sep 17 00:00:00 2001
From: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Date: Sun, 7 Apr 2024 23:28:20 +0000
Subject: [PATCH] Change mapping of external folders to copying them to the
 docker image

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
---
 package-system/pyside2/Dockerfile            | 2 ++
 package-system/pyside2/build-linux.sh        | 4 ++--
 package-system/pyside2/docker_build_linux.sh | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package-system/pyside2/Dockerfile b/package-system/pyside2/Dockerfile
index 77841d4a..394f73d9 100644
--- a/package-system/pyside2/Dockerfile
+++ b/package-system/pyside2/Dockerfile
@@ -77,5 +77,7 @@ ARG CACHEBUST=1
 
 COPY ${DOCKER_BUILD_SCRIPT} /data/workspace/
 COPY src /data/workspace/src/
+COPY ${PYTHON_FOLDER_NAME} /data/workspace/${PYTHON_FOLDER_NAME}/
+COPY ${QT_FOLDER_NAME} /data/workspace/${QT_FOLDER_NAME}/
 
 ENTRYPOINT ["/bin/bash"]
diff --git a/package-system/pyside2/build-linux.sh b/package-system/pyside2/build-linux.sh
index 8cb9acd4..6e43361e 100755
--- a/package-system/pyside2/build-linux.sh
+++ b/package-system/pyside2/build-linux.sh
@@ -80,8 +80,8 @@ fi
 
 # Run the Docker Image
 echo "Running build script in the docker image"
-echo docker run -v $TEMP_FOLDER/src:/data/workspace/src -v $TEMP_FOLDER/$QT_FOLDER_NAME:/data/workspace/$QT_FOLDER_NAME -v $TEMP_FOLDER/$PYTHON_FOLDER_NAME:/data/workspace/$PYTHON_FOLDER_NAME --tty ${DOCKER_IMAGE_NAME}:latest /data/workspace/$DOCKER_BUILD_SCRIPT 
-docker run -v $TEMP_FOLDER/$QT_FOLDER_NAME:/data/workspace/$QT_FOLDER_NAME -v $TEMP_FOLDER/$PYTHON_FOLDER_NAME:/data/workspace/$PYTHON_FOLDER_NAME --tty ${DOCKER_IMAGE_NAME}:latest /data/workspace/$DOCKER_BUILD_SCRIPT 
+echo docker run -it --tty ${DOCKER_IMAGE_NAME}:latest /data/workspace/$DOCKER_BUILD_SCRIPT 
+docker run --tty ${DOCKER_IMAGE_NAME}:latest /data/workspace/$DOCKER_BUILD_SCRIPT 
 if [ $? -ne 0 ]
 then
     echo Failed to build from docker image ${DOCKER_IMAGE_NAME}:latest
diff --git a/package-system/pyside2/docker_build_linux.sh b/package-system/pyside2/docker_build_linux.sh
index 73d981f2..2846792c 100755
--- a/package-system/pyside2/docker_build_linux.sh
+++ b/package-system/pyside2/docker_build_linux.sh
@@ -20,7 +20,7 @@ echo "Using Qt at ${DEP_QT_BASE}"
 LOCAL_PYTHON3_BIN=${DEP_PYTHON_BASE}/python/bin/python3
 if [ ! -f $LOCAL_PYTHON3_BIN ]
 then
-    echo "Required local 3P python not detected"
+    echo "Required local 3P python not detected at ${LOCAL_PYTHON3_BIN}"
     exit 1
 fi
 
@@ -31,7 +31,7 @@ LOCAL_3P_QTBUILD_QMAKE_PATH=`readlink -f $LOCAL_3P_QTBUILD_PATH/bin/qmake`
 LOCAL_3P_QTBUILD_LIB_PATH=`readlink -f $LOCAL_3P_QTBUILD_PATH/lib`
 if [ ! -f "$LOCAL_3P_QTBUILD_QMAKE_PATH" ]
 then
-    echo "Missing 3P dependency of Qt $LOCAL_3P_QTBUILD_PATH"
+    echo "Missing 3P dependency of Qt ${LOCAL_3P_QTBUILD_PATH}"
     echo
     exit 1
 fi