Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: fix running docker when executed from cronjob (#3822)

Browse source 
Turns out docker doesn't like faking terminal if STDIN is not attached
to a real terminal.
This commit is contained in:
Andrey Lushnikov 2020-09-09 17:27:14 -07:00 committed by GitHub
parent ee98bd0a29
commit 29b809887e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
browser_patches/ffmpeg/build.sh
View file

@ -45,11 +45,18 @@ elif [[ "$1" == --cross-compile-win* ]]; then
exit 1 exit 1
fi 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 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 cd output && zip ffmpeg.zip ffmpeg-win32.exe
elif [[ "$1" == "--cross-compile-win64" ]]; then 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 cd output && zip ffmpeg.zip ffmpeg-win64.exe
else else
echo "ERROR: unsupported platform - $1" echo "ERROR: unsupported platform - $1"