@@ -12,6 +12,7 @@ source "${script_dir}/balena-lib.inc"
12
12
[ -z " ${PACKAGES} " ] && echo " list of packages to install without dependencies" && exit 1
13
13
[ -z " ${RELEASE_VERSION} " ] && echo " A release version needs to be defined" && exit 1
14
14
[ -z " ${WORKSPACE} " ] && echo " Workspace needs to be defined" && exit 1
15
+ DEPLOY_DIR=" ${DEPLOY_DIR:- " ${WORKSPACE} /deploy-jenkins" } "
15
16
16
17
[ -z " ${PACKAGE_TYPE} " ] && PACKAGE_TYPE=" ipk"
17
18
@@ -63,10 +64,10 @@ echo "LABEL ${BALENA_HOSTOS_BLOCK_REQUIRES_REBOOT}=1" >> "${TMPDIR}/Dockerfile"
63
64
echo " LABEL ${BALENA_HOSTOS_BLOCK_STORE} =data" >> " ${TMPDIR} /Dockerfile"
64
65
65
66
# Copy local package feed to context if available from previous build step
66
- if [ -d " ${WORKSPACE} /deploy-jenkins /${PACKAGE_TYPE} " ]; then
67
+ if [ -d " ${DEPLOY_DIR} /${PACKAGE_TYPE} " ]; then
67
68
ARCH_LIST=" "
68
69
mkdir -p " ${TMPDIR} /feed"
69
- cp -r " ${WORKSPACE} /deploy-jenkins /${PACKAGE_TYPE} " " ${TMPDIR} /feed/"
70
+ cp -r " ${DEPLOY_DIR} /${PACKAGE_TYPE} " " ${TMPDIR} /feed/"
70
71
# Extract package architecture list from feed
71
72
# Each architecture is one directory
72
73
while IFS=$' \n ' read -r dir; do
@@ -75,7 +76,7 @@ if [ -d "${WORKSPACE}/deploy-jenkins/${PACKAGE_TYPE}" ]; then
75
76
else
76
77
ARCH_LIST=" ${ARCH_LIST} ${dir} "
77
78
fi
78
- done< <( find " ${WORKSPACE} /deploy-jenkins /${PACKAGE_TYPE} " -mindepth 1 -maxdepth 1 -type d | xargs -I{} basename {})
79
+ done< <( find " ${DEPLOY_DIR} /${PACKAGE_TYPE} " -mindepth 1 -maxdepth 1 -type d | xargs -I{} basename {})
79
80
else
80
81
proto=${FEED_URL%:* }
81
82
if [ -z " ${FEED_URL} " ] || [ " ${proto} " = " file" ]; then
@@ -91,8 +92,8 @@ docker rmi -f $(docker images --filter "label=${BALENA_HOSTOS_BLOCK_CLASS}" --fo
91
92
92
93
if balena build --logs --nocache --deviceType " ${MACHINE} " --arch " ${ARCH} " --buildArg PACKAGES=" ${PACKAGES} " --buildArg ARCH_LIST=" ${ARCH_LIST} " --buildArg NAMESPACE=" ${NAMESPACE:- resin} " ; then
93
94
image_id=$( docker images --filter " label=${BALENA_HOSTOS_BLOCK_CLASS} " --format " {{.ID}}" )
94
- mkdir -p " ${WORKSPACE} /deploy-jenkins "
95
- docker save " ${image_id} " > " ${WORKSPACE} /deploy-jenkins /${APPNAME} -${RELEASE_VERSION} .docker"
95
+ mkdir -p " ${DEPLOY_DIR} "
96
+ docker save " ${image_id} " > " ${DEPLOY_DIR} /${APPNAME} -${RELEASE_VERSION} .docker"
96
97
else
97
98
echo " [ERROR] Fail to build"
98
99
exit 1
0 commit comments