Skip to content

Commit

Permalink
devops: fix running docker when executed from cronjob (#3822)
Browse files Browse the repository at this point in the history
Turns out docker doesn't like faking terminal if STDIN is not attached
to a real terminal.
  • Loading branch information
aslushnikov authored Sep 10, 2020
1 parent ee98bd0 commit 29b8098
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions browser_patches/ffmpeg/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,18 @@ elif [[ "$1" == --cross-compile-win* ]]; then
exit 1
fi

dockerflags="";
# Use |-it| to run docker to support Ctrl-C if we run the script inside interactive terminal.
# Otherwise (e.g. cronjob) - do nothing.
if [[ -t 0 ]]; then
dockerflags="-it"
fi

if [[ "$1" == "--cross-compile-win32" ]]; then
time docker run --init --rm -v"${PWD}":/host -it ubuntu:18.04 bash /host/crosscompile-from-linux-to-win.sh --win32 /host/output/ffmpeg-win32.exe
time docker run --init --rm -v"${PWD}":/host ${dockerflags} ubuntu:18.04 bash /host/crosscompile-from-linux-to-win.sh --win32 /host/output/ffmpeg-win32.exe
cd output && zip ffmpeg.zip ffmpeg-win32.exe
elif [[ "$1" == "--cross-compile-win64" ]]; then
time docker run --init --rm -v"${PWD}":/host -it ubuntu:18.04 bash /host/crosscompile-from-linux-to-win.sh --win64 /host/output/ffmpeg-win64.exe
time docker run --init --rm -v"${PWD}":/host ${dockerflags} ubuntu:18.04 bash /host/crosscompile-from-linux-to-win.sh --win64 /host/output/ffmpeg-win64.exe
cd output && zip ffmpeg.zip ffmpeg-win64.exe
else
echo "ERROR: unsupported platform - $1"
Expand Down

0 comments on commit 29b8098

Please sign in to comment.