meissa/dda-devops-build
6
1
Fork 0
Code Issues Pull requests Projects Releases 33 Packages Wiki Activity

updated ci and build scripts

Browse source
This commit is contained in:
bom 2022-05-20 10:01:53 +02:00
parent 2a3d2e20ec
commit 91571d5dc7
3 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.gitlab-ci.yml
View file

@ -7,6 +7,7 @@ before_script:
stages: stages:
- lint - lint
- image
- upload - upload
flake8: flake8:
@ -48,3 +49,19 @@ pypi-stable:
- if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
script: script:
- pyb -P version=$CI_COMMIT_TAG publish upload - pyb -P version=$CI_COMMIT_TAG publish upload
clojure-image-test-publish:
image: domaindrivenarchitecture/devops-build:latest
stage: image
rules:
- if: '$CI_COMMIT_TAG != null'
script:
- cd infrastructure/clojure && pyb image test publish
devops-build-image-test-publish:
image: domaindrivenarchitecture/devops-build:latest
stage: image
rules:
- if: '$CI_COMMIT_TAG != null'
script:
- cd infrastructure/devops-build && pyb image test publish

13
infrastructure/clojure/build.py
View file

@ -16,10 +16,17 @@ class MyBuild(DevopsDockerBuild):
def initialize(project): def initialize(project):
project.build_depends_on('ddadevops>=0.13.0') project.build_depends_on('ddadevops>=0.13.0')
stage = 'notused' stage = 'notused'
dockerhub_user = gopass_field_from_path('meissa/web/docker.com', 'login') dockerhub_user = environ.get('DOCKERHUB_USER')
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')
tag = environ.get('CI_COMMIT_TAG')
if not tag:
tag = get_tag_from_latest_commit()
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, docker_publish_tag=tag)
build = MyBuild(project, config) build = MyBuild(project, config)
build.initialize_build_dir() build.initialize_build_dir()

13
infrastructure/devops-build/build.py
View file

@ -16,10 +16,17 @@ class MyBuild(DevopsDockerBuild):
def initialize(project): def initialize(project):
project.build_depends_on('ddadevops>=0.13.0') project.build_depends_on('ddadevops>=0.13.0')
stage = 'notused' stage = 'notused'
dockerhub_user = gopass_field_from_path('meissa/web/docker.com', 'login') dockerhub_user = environ.get('DOCKERHUB_USER')
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')
tag = environ.get('CI_COMMIT_TAG')
if not tag:
tag = get_tag_from_latest_commit()
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, docker_publish_tag=tag)
build = MyBuild(project, config) build = MyBuild(project, config)
build.initialize_build_dir() build.initialize_build_dir()