From 2233676fdda79fb16ddf5b8eeba734191aa48f3c Mon Sep 17 00:00:00 2001 From: Clemens Geibel Date: Fri, 4 Dec 2020 11:45:30 +0100 Subject: [PATCH] Check if Dockerhub environment exists before using gopass --- infrastrucure/docker/build.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/infrastrucure/docker/build.py b/infrastrucure/docker/build.py index 9940d62..ce7e6a8 100644 --- a/infrastrucure/docker/build.py +++ b/infrastrucure/docker/build.py @@ -15,8 +15,12 @@ class MyBuild(DevopsDockerBuild): def initialize(project): project.build_depends_on('ddadevops>=0.6.1') stage = 'notused' - dockerhub_user = environ.get('DOCKERHUB_USER', gopass_field_from_path('meissa/web/docker.com', 'login')) - dockerhub_password = environ.get('DOCKERHUB_PASSWORD', gopass_password_from_path('meissa/web/docker.com')) + dockerhub_user = environ.get('DOCKERHUB_USER') + if not dockerhub_user: + dockerhub_user = gopass_field_from_path('meissa/web/docker.com', 'login') + dockerhub_password = environ.get('DOCKERHUB_PASSWORD') + if not dockerhub_password: + dockerhub_password = gopass_password_from_path('meissa/web/docker.com') config = create_devops_docker_build_config( stage, PROJECT_ROOT_PATH, MODULE, dockerhub_user, dockerhub_password) build = MyBuild(project, config)