diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index 3a87c9f..0fdf5b6 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -1,14 +1,20 @@ from os import environ +from datetime import datetime from pybuilder.core import task, init from ddadevops import * -name = "c4k-taiga-backup" -MODULE = "docker" +name = "c4k-taiga" +MODULE = "backup" PROJECT_ROOT_PATH = "../.." +version = "1.2.0" @init def initialize(project): + image_tag = version + if "dev" in image_tag: + image_tag += datetime.now().strftime("%Y-%m-%d-%H-%M-%S") + input = { "name": name, "module": MODULE, @@ -16,9 +22,11 @@ def initialize(project): "project_root_path": PROJECT_ROOT_PATH, "build_types": ["IMAGE"], "mixin_types": [], + "image_naming": "NAME_AND_MODULE", + "image_tag": f"{image_tag}", } - project.build_depends_on("ddadevops>=4.0.0-dev") + project.build_depends_on("ddadevops>=4.7.0") build = DevopsImageBuild(project, input) build.initialize_build_dir() @@ -29,21 +37,18 @@ def image(project): build = get_devops_build(project) build.image() - @task def drun(project): build = get_devops_build(project) build.drun() +@task +def test(project): + build = get_devops_build(project) + build.test() @task def publish(project): build = get_devops_build(project) build.dockerhub_login() - build.dockerhub_publish() - - -@task -def test(project): - build = get_devops_build(project) - build.test() + build.dockerhub_publish() \ No newline at end of file diff --git a/package.json b/package.json index fb42886..61c1eee 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-taiga", "description": "Generate c4k yaml for a taiga project management deployment.", "author": "meissa GmbH", - "version": "1.1.3-SNAPSHOT", + "version": "1.2.0", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-taiga#readme", "repository": "https://www.npmjs.com/package/c4k-taiga", "license": "APACHE2", diff --git a/project.clj b/project.clj index 903f955..9bbdfb2 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-taiga "1.1.3-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-taiga "1.2.0" :description "taiga c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0"