[docker] Minor improvements (#11352)

This commit is contained in:
Sumanth Ratna 2020-10-19 15:42:53 -04:00 committed by GitHub
parent acbd12eabf
commit 4946c1e6de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -19,7 +19,7 @@ PYTHON_WHL_VERSION = "cp37m"
def _merge_build(): def _merge_build():
return os.environ.get("TRAVIS_PULL_REQUEST") == "false" return os.environ.get("TRAVIS_PULL_REQUEST").lower() == "false"
def _release_build(): def _release_build():
@ -45,7 +45,7 @@ def _get_wheel_name():
f"{_get_root_dir()}/.whl/*{PYTHON_WHL_VERSION}-manylinux*") f"{_get_root_dir()}/.whl/*{PYTHON_WHL_VERSION}-manylinux*")
assert len(matches) == 1, ( assert len(matches) == 1, (
f"Found ({len(matches)}) matches " f"Found ({len(matches)}) matches "
"'*{PYTHON_WHL_VERSION}-manylinux*' instead of 1") f"'*{PYTHON_WHL_VERSION}-manylinux*' instead of 1")
return os.path.basename(matches[0]) return os.path.basename(matches[0])
@ -181,7 +181,7 @@ def build_ray_ml():
def push_and_tag_images(push_base_images: bool): def push_and_tag_images(push_base_images: bool):
if _merge_build(): if _merge_build():
docker_password = os.environ.get("DOCKER_PASSWORD") docker_password = os.environ.get("DOCKER_PASSWORD")
assert docker_password is not None, "DOCKER_PASSWORD not set." assert docker_password, "DOCKER_PASSWORD not set."
DOCKER_CLIENT.api.login( DOCKER_CLIENT.api.login(
username=DOCKER_USERNAME, username=DOCKER_USERNAME,
password=os.environ.get("DOCKER_PASSWORD")) password=os.environ.get("DOCKER_PASSWORD"))