adjust image builds to new build-version
This commit is contained in:
parent
550f220759
commit
69ddcbbf7b
2 changed files with 15 additions and 28 deletions
|
@ -2,8 +2,8 @@ from os import environ
|
||||||
from pybuilder.core import task, init
|
from pybuilder.core import task, init
|
||||||
from ddadevops import *
|
from ddadevops import *
|
||||||
|
|
||||||
name = "ddabuild"
|
name = "clojure"
|
||||||
MODULE = "clojure"
|
MODULE = "image"
|
||||||
PROJECT_ROOT_PATH = "../.."
|
PROJECT_ROOT_PATH = "../.."
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3,38 +3,25 @@ from pybuilder.core import task, init
|
||||||
from ddadevops import *
|
from ddadevops import *
|
||||||
|
|
||||||
name = "devops-build"
|
name = "devops-build"
|
||||||
MODULE = "docker"
|
MODULE = "image"
|
||||||
PROJECT_ROOT_PATH = "../.."
|
PROJECT_ROOT_PATH = "../.."
|
||||||
|
|
||||||
|
|
||||||
@init
|
@init
|
||||||
def initialize(project):
|
def initialize(project):
|
||||||
|
|
||||||
|
input = {
|
||||||
|
"name": name,
|
||||||
|
"module": MODULE,
|
||||||
|
"stage": "notused",
|
||||||
|
"project_root_path": PROJECT_ROOT_PATH,
|
||||||
|
"build_types": ["IMAGE"],
|
||||||
|
"mixin_types": [],
|
||||||
|
}
|
||||||
|
|
||||||
project.build_depends_on("ddadevops>=4.0.0-dev")
|
project.build_depends_on("ddadevops>=4.0.0-dev")
|
||||||
stage = "notused"
|
|
||||||
dockerhub_user = environ.get("DOCKERHUB_USER")
|
build = DevopsImageBuild(project, input)
|
||||||
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()
|
|
||||||
|
|
||||||
devops = Devops(
|
|
||||||
stage=stage,
|
|
||||||
project_root_path=PROJECT_ROOT_PATH,
|
|
||||||
module=MODULE,
|
|
||||||
name=name,
|
|
||||||
)
|
|
||||||
image = Image(
|
|
||||||
dockerhub_user=dockerhub_user,
|
|
||||||
dockerhub_password=dockerhub_password,
|
|
||||||
docker_publish_tag=tag,
|
|
||||||
devops=devops,
|
|
||||||
)
|
|
||||||
|
|
||||||
build = DevopsImageBuild(project, image=image)
|
|
||||||
build.initialize_build_dir()
|
build.initialize_build_dir()
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue