Skip to content

Commit e5ce3ba

Browse files
authored
Fix docker build error on Travis (#62)
* Update build_docker.sh * Update build_docker.sh * Update build_docker.sh
1 parent d842135 commit e5ce3ba

File tree

1 file changed

+30
-3
lines changed

1 file changed

+30
-3
lines changed

script/build_docker.sh

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ match_version=$(python $CUR_DIR/script/match_version_buildinfo.py)
1414

1515
if [ $build_docker != false ];then
1616
if [[ $(jq --arg ver "$match_version" '.[$ver]' $config_file) != null ]]; then
17-
docker_builddir=$(jq -r --arg ver "$match_version" '.[$ver].dir' $config_file)
17+
docker_builddir=$(jq -r --arg ver "$match_version" '.[$ver].dir' "$config_file"); docker_builddir=${docker_builddir:-.}; [ "$docker_builddir" = "null" ] && docker_builddir="."
1818
args=$(jq -r --arg ver "$match_version" '.[$ver].args' $config_file)
1919
patches=$(jq -r --arg ver "$match_version" '.[$ver].patches' $config_file)
2020
# By default send PACKAGE_VERSION argument.
21-
build_args ="--build-arg PACKAGE_VERSION=$version"
21+
build_args="--build-arg PACKAGE_VERSION=$version"
2222
if [ $args != null ]; then
2323
for row in $(echo "$args" | jq -r 'to_entries[] | @base64'); do
2424
key=$(echo "$row" | base64 -d | jq -r '.key')
@@ -49,7 +49,34 @@ if [ $build_docker != false ];then
4949
echo "Building docker image"
5050
echo "sudo docker build $build_args -t $image_name $docker_builddir"
5151
echo "*************************************************************************************"
52-
sudo docker build $build_args -t $image_name $docker_builddir
52+
sudo docker build $build_args -t $image_name $docker_builddir > docker_build.log 2>&1 &
53+
SCRIPT_PID=$!
54+
while ps -p $SCRIPT_PID > /dev/null
55+
do
56+
echo "$SCRIPT_PID is running"
57+
sleep 100
58+
done
59+
wait $SCRIPT_PID
60+
my_pid_status=$?
61+
docker_build_size=$(stat -c %s docker_build.log)
62+
63+
if [ $my_pid_status != 0 ];
64+
then
65+
if [ $docker_build_size -lt 1800000 ];
66+
then
67+
cat docker_build.log
68+
else
69+
tail -300 docker_build.log
70+
fi
71+
exit 1
72+
else
73+
if [ $docker_build_size -lt 1800000 ];
74+
then
75+
cat docker_build.log
76+
else
77+
tail -300 docker_build.log
78+
fi
79+
fi
5380
docker save -o "$HOME/build/$TRAVIS_REPO_SLUG/image.tar" $image_name
5481
else
5582
echo "Docker image is not supported"

0 commit comments

Comments
 (0)