CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-05-26 07:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

builder: Move checkouting code before it's cloning to image

Browse Source
This commit is contained in:
Arthur Golubtsov
2019-09-08 21:45:01 +03:00
parent b32eaeb71d
commit 27f777512b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
builder/image-build.sh
View File

@@ -72,6 +72,15 @@ get_image ${IMAGE_PATH} ${SOURCE_IMAGE}
# Make free space
img-resize ${IMAGE_PATH} max '5G'
# Checkout to tag's branch if built with travis tag
if [[ ! -z ${TRAVIS_TAG} ]]; then
REMOTE_BRANCH="$(git branch -r --contains ${TRAVIS_TAG} | sed -n 1p | cut -d ' ' -f 5)"
BRANCH="$(echo ${REMOTE_BRANCH} | cut -d '/' -f 2)"
echo_stamp "Checkout to ${REMOTE_BRANCH} from ${TRAVIS_TAG}" "INFO"
git branch ${BRANCH} ${REMOTE_BRANCH}
git checkout ${BRANCH}
fi
# Copy cloned repository to the image
# Include dotfiles in globs (asterisks)
shopt -s dotglob
@@ -105,15 +114,6 @@ img-chroot ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-configure.sh'
cd ${REPO_DIR}
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
# Checkout to tag's branch if built with travis tag
if [[ ! -z ${TRAVIS_TAG} ]]; then
REMOTE_BRANCH="$(git branch -r --contains ${TRAVIS_TAG} | sed -n 1p | cut -d ' ' -f 5)"
BRANCH="$(echo ${REMOTE_BRANCH} | cut -d '/' -f 2)"
echo_stamp "Checkout to ${REMOTE_BRANCH} from ${TRAVIS_TAG}" "INFO"
git branch ${BRANCH} ${REMOTE_BRANCH}
git checkout ${BRANCH}
fi
# Copy service file for clever show client
img-chroot ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/clever-show.service' '/lib/systemd/system/'