Skip to content

Commit 81f474b

Browse files
authored
Merge pull request #5412 from brucehoff/PLFM-9253
PLFM-9253
2 parents e6fcd10 + 4a8b15c commit 81f474b

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

docker_build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,17 @@ if [ ${SETTINGS_XML} ]; then
7979
echo ${SETTINGS_XML} > ${m2_cache_parent_folder}/.m2/settings.xml
8080
fi
8181

82+
if [ -n "${HOME_DIR_WITHIN_CONTAINER}" ]; then
83+
HOME_DIR_WITHIN_CONTAINER="/root"
84+
fi
8285

8386
mysql -u${rds_user_name} -p${rds_password} -h ${org_sagebionetworks_repository_database_connection_url} -sN -e "DROP DATABASE ${db_name};CREATE DATABASE ${db_name};"
8487
mysql -u${rds_user_name} -p${rds_password} -h ${org_sagebionetworks_table_cluster_endpoint_0} -sN -e "DROP DATABASE ${db_name};CREATE DATABASE ${db_name};"
8588

8689
# create build container and run build
8790
docker run --user "$(id -u):$(id -g)" -i --rm --name ${build_container_name} \
8891
-m 5500M \
89-
-v ${m2_cache_parent_folder}/.m2:/root/.m2 \
92+
-v ${m2_cache_parent_folder}/.m2:${HOME_DIR_WITHIN_CONTAINER}/.m2 \
9093
-v ${src_folder}:/repo \
9194
-v /etc/localtime:/etc/localtime:ro \
9295
-e MAVEN_OPTS="-Xms256m -Xmx2048m -XX:MaxPermSize=512m" \
@@ -118,7 +121,7 @@ ${AWS_CREDS} \
118121
-Dorg.sagebionetworks.cloudfront.keypair="${org_sagebionetworks_cloudfront_keypair}" \
119122
-Dorg.sagebionetworks.cloudfront.domainname="${org_sagebionetworks_cloudfront_domainname}" \
120123
-Dorg.sagebionetworks.cloudfront.private.key.secret="${org_sagebionetworks_cloudfront_private_key_secret}" \
121-
-Duser.home=/root"
124+
-Duser.home=${HOME_DIR_WITHIN_CONTAINER}"
122125

123126
clean_up_container ${build_container_name}
124127

jenkins_build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export src_folder=${HOME}/workspace/${JOB_NAME}
2121
BASEDIR=$(dirname "$0")
2222

2323
export stack=dev
24+
export HOME_DIR_WITHIN_CONTAINER = "/tmp"
2425

2526
${BASEDIR}/before.sh
2627
${BASEDIR}/docker_build.sh

0 commit comments

Comments
 (0)