Skip to content

Commit

Permalink
Streamline box build even more again
Browse files Browse the repository at this point in the history
  • Loading branch information
DonMartin76 committed Dec 10, 2019
1 parent c874940 commit eedb57e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions src/box/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ fi

pushd wicked.haufe.io
git checkout ${branch}

# Once for the global state
echo ${branch} > ./src/git_branch
echo ${build_date} > ./src/build_date
git log -1 --decorate=short > ./src/git_last_commit

for repo in ${repos}; do
pushd src/${repo}
rm -f ./build_date ./git_last_commit ./git_branch
Expand Down
2 changes: 1 addition & 1 deletion src/tools/release/verify-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ for alpine in "-alpine" ""; do
git remote add github https://github.com/Haufe-Lexware/wicked.haufe.io.git &> /dev/null
branchHead=$(git ls-remote github refs/heads/${branch} | cut -f 1)
echo "- ${branch} HEAD ref: ${branchHead}"
echo "- Pulling docker images..."
imageName=haufelexware/${repo}:${branch}${alpine}
isNotEnvBased=0
if [[ "wicked.kong" == "$repo" ]] || [[ "wicked.k8s-init" == "$repo" ]] || [[ "wicked.k8s-tool" == "$repo" ]] || [[ "wicked.box" == "$repo" ]]; then
imageName=haufelexware/${repo}:${branch}
isNotEnvBased=1
fi
echo "- Pulling image ${imageName}..."
docker pull ${imageName} &> docker.log
docker create --name tmp_image ${imageName} &> /dev/null
docker cp tmp_image:/usr/src/app/git_last_commit .
Expand Down

0 comments on commit eedb57e

Please sign in to comment.