CopterExpress/clover
1
0
Fork 0
mirror of https://github.com/CopterExpress/clover.git synced 2026-05-29 22:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

image_builder: fix image path

Browse Source
This commit is contained in:
Artem Smirnov
2018-09-24 18:08:16 +03:00
parent 6dc0bd5cc5
commit 72b20f8c94
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builder_docker/image-build.sh
View File

@@ -54,10 +54,11 @@ git clone ${TARGET_REPO} --single-branch --branch ${TARGET_REF} --depth 1 ${REPO
|| (echo "Error: TARGET_CONFIG doesn't exist!"; return 1)
CUR_DIR="$(pwd)" && cd ${REPO_DIR}
TARGET_COMMIT=$(git show-ref --hash origin/master | cut -c1-7)
#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_VERSION="${TARGET_REF}_${TARGET_COMMIT}"
export IMAGE_VERSION="${TARGET_REF}"
export IMAGE_PATH="$(pwd)/image/$(basename -s '.git' ${TARGET_REPO})_${IMAGE_VERSION}.img"
get_image ${IMAGE_PATH} $(jq '.source_image' -r ${TARGET_CONFIG})