Merge branch 'master' into feature/workspace/protoc
This commit is contained in:
@ -151,6 +151,7 @@ services:
|
||||
- INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
|
||||
- INSTALL_WKHTMLTOPDF=${WORKSPACE_INSTALL_WKHTMLTOPDF}
|
||||
- INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
|
||||
- INSTALL_LNAV=${WORKSPACE_INSTALL_LNAV}
|
||||
- INSTALL_PROTOC=${WORKSPACE_INSTALL_PROTOC}
|
||||
- PROTOC_VERSION=${WORKSPACE_PROTOC_VERSION}
|
||||
- http_proxy
|
||||
|
Reference in New Issue
Block a user