meissa/dda-backup
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check if Dockerhub environment exists before using gopass

Browse source
This commit is contained in:
Clemens Geibel 2020-12-04 11:45:30 +01:00
parent 742fe2e641
commit 2233676fdd
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
infrastrucure/docker/build.py
View file

@ -15,8 +15,12 @@ class MyBuild(DevopsDockerBuild):
def initialize(project): def initialize(project):
project.build_depends_on('ddadevops>=0.6.1') project.build_depends_on('ddadevops>=0.6.1')
stage = 'notused' stage = 'notused'
dockerhub_user = environ.get('DOCKERHUB_USER', gopass_field_from_path('meissa/web/docker.com', 'login')) dockerhub_user = environ.get('DOCKERHUB_USER')
dockerhub_password = environ.get('DOCKERHUB_PASSWORD', gopass_password_from_path('meissa/web/docker.com')) 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( config = create_devops_docker_build_config(
stage, PROJECT_ROOT_PATH, MODULE, dockerhub_user, dockerhub_password) stage, PROJECT_ROOT_PATH, MODULE, dockerhub_user, dockerhub_password)
build = MyBuild(project, config) build = MyBuild(project, config)