From 09ee1a48c53c92a00967c998b95f1699183e256a Mon Sep 17 00:00:00 2001 From: jem Date: Fri, 13 Nov 2020 16:59:45 +0100 Subject: [PATCH] add publish --- .gitlab-ci.yml | 2 +- infrastrucure/docker/build.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5cfee0..654aaf4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,4 +16,4 @@ before_script: build: stage: build script: - - cd infrastrucure/docker && pyb image test + - cd infrastrucure/docker && pyb image test publish diff --git a/infrastrucure/docker/build.py b/infrastrucure/docker/build.py index dfdfe4f..e603c1c 100644 --- a/infrastrucure/docker/build.py +++ b/infrastrucure/docker/build.py @@ -1,10 +1,9 @@ -from subprocess import run from os import environ from pybuilder.core import task, init from ddadevops import * import logging -name = 'meissa-cloud' +name = 'dda-backup' MODULE = 'docker' PROJECT_ROOT_PATH = '../..' @@ -16,8 +15,8 @@ class MyBuild(DevopsDockerBuild): def initialize(project): project.build_depends_on('ddadevops>=0.6.1') stage = 'notused' - dockerhub_user = 'notused' - dockerhub_password = 'notused' + dockerhub_user = environ.get('DOCKERHUB_USER', None) + dockerhub_password = environ.get('DOCKERHUB_PASSWORD', None) config = create_devops_docker_build_config( stage, PROJECT_ROOT_PATH, MODULE, dockerhub_user, dockerhub_password) build = MyBuild(project, config)