CopterExpress/clover
1
0
Fork 0
mirror of https://github.com/CopterExpress/clover.git synced 2026-05-26 21:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

image_builder: fix got TARGET_COMMIT

Browse Source
This commit is contained in:
Artem Smirnov
2018-09-21 23:17:14 +03:00
parent ee88d7d6bf
commit f236db3392
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builder_docker/build.sh
View File

@@ -29,7 +29,11 @@ git clone ${TARGET_REPO} --single-branch --branch ${TARGET_REF} --depth 1 ${REPO
[[ -f ${REPO_DIR}${TARGET_CONFIG} ]] && export TARGET_CONFIG=${REPO_DIR}${TARGET_CONFIG} \
|| (echo "Error: TARGET_CONFIG doesn't exist!"; return 1)
export IMAGE_VERSION="${TARGET_REF}_$(git show-ref --hash origin/master | cut -c1-7)"
CUR_DIR="$(pwd)" && cd ${REPO_DIR}
TARGET_COMMIT=$(git show-ref --hash origin/master | cut -c1-7)
cd ${CUR_DIR} && unset CUR_DIR
export IMAGE_VERSION="${TARGET_REF}_${TARGET_COMMIT}"
export IMAGE_PATH="$(pwd)/image/$(basename -s '.git' ${TARGET_REPO})_${IMAGE_VERSION}.img"
./get_image.sh ${IMAGE_PATH} $(jq '.source_image' -r ${TARGET_CONFIG})