Merge pull request #14793 from jherico/fix/container_build_gradle_failures

79.0/master: Fix errors and intermittent failures in Android gradle builds in containers
This commit is contained in:
Shannon Romano 2019-01-29 13:32:30 -08:00 committed by GitHub
commit ce0334d10b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -7,15 +7,12 @@ docker build --build-arg BUILD_UID=`id -u` -t "${DOCKER_IMAGE_NAME}" -f docker/D
# The Jenkins PR builds use VERSION_CODE, but the release builds use VERSION
# So make sure we use VERSION_CODE consistently
if [-z "$VERSION_CODE"]; then
export VERSION_CODE=$VERSION
fi
test -z "$VERSION_CODE" && export VERSION_CODE=$VERSION
docker run \
--rm \
--security-opt seccomp:unconfined \
-v "${WORKSPACE}":/home/jenkins/hifi \
-v /home/jenkins/.gradle:/home/jenkins/.gradle \
-e RELEASE_NUMBER \
-e RELEASE_TYPE \
-e ANDROID_APP \