From 31ac285df0405497fbac30449daa059a72d20111 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Tue, 8 Aug 2023 09:04:28 +0200 Subject: [PATCH 1/3] add kotlin image --- build.py | 1 + infrastructure/kotlin/build.py | 56 +++++++++++++++++++ infrastructure/kotlin/image/Dockerfile | 4 ++ .../kotlin/image/resources/install.sh | 17 ++++++ infrastructure/kotlin/test/.keep | 0 5 files changed, 78 insertions(+) create mode 100644 infrastructure/kotlin/build.py create mode 100644 infrastructure/kotlin/image/Dockerfile create mode 100755 infrastructure/kotlin/image/resources/install.sh create mode 100644 infrastructure/kotlin/test/.keep diff --git a/build.py b/build.py index a1fddfb..7dfd7e2 100644 --- a/build.py +++ b/build.py @@ -102,6 +102,7 @@ def initialize(project): "infrastructure/ddadevops/build.py", "infrastructure/clj-cljs/build.py", "infrastructure/clj/build.py", + "infrastructure/kotlin/build.py", ], } diff --git a/infrastructure/kotlin/build.py b/infrastructure/kotlin/build.py new file mode 100644 index 0000000..e487a33 --- /dev/null +++ b/infrastructure/kotlin/build.py @@ -0,0 +1,56 @@ +from os import environ +from datetime import datetime +from pybuilder.core import task, init +from ddadevops import * + +name = "ddadevops" +MODULE = "kotlin" +PROJECT_ROOT_PATH = "../.." +version = "4.3.2-dev" + +@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, + "stage": "notused", + "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") + + build = DevopsImageBuild(project, input) + build.initialize_build_dir() + + +@task +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() diff --git a/infrastructure/kotlin/image/Dockerfile b/infrastructure/kotlin/image/Dockerfile new file mode 100644 index 0000000..23a32d6 --- /dev/null +++ b/infrastructure/kotlin/image/Dockerfile @@ -0,0 +1,4 @@ +FROM debian:stable-slim + +ADD resources /tmp +RUN /tmp/install.sh diff --git a/infrastructure/kotlin/image/resources/install.sh b/infrastructure/kotlin/image/resources/install.sh new file mode 100755 index 0000000..89ccc2e --- /dev/null +++ b/infrastructure/kotlin/image/resources/install.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -eux + +function main() { + upgradeSystem + + apt -qqy install curl git kotlin gradle + + #install pyb + apt -qqy install python3 python3-pip; + pip3 install pybuilder 'ddadevops>=4.2.0' deprecation dda-python-terraform boto3 pyyaml inflection --break-system-packages; + + cleanupDocker +} + +source /tmp/install_functions.sh +main \ No newline at end of file diff --git a/infrastructure/kotlin/test/.keep b/infrastructure/kotlin/test/.keep new file mode 100644 index 0000000..e69de29 From 00202edecc815688e627d600ca76032015286f25 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Fri, 11 Aug 2023 13:35:15 +0200 Subject: [PATCH 2/3] add kotlin image --- infrastructure/kotlin/image/resources/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/kotlin/image/resources/install.sh b/infrastructure/kotlin/image/resources/install.sh index 89ccc2e..202f871 100755 --- a/infrastructure/kotlin/image/resources/install.sh +++ b/infrastructure/kotlin/image/resources/install.sh @@ -4,7 +4,7 @@ set -eux function main() { upgradeSystem - apt -qqy install curl git kotlin gradle + apt -qqy install curl git kotlin gradle iputils-ping ssh #install pyb apt -qqy install python3 python3-pip; From ef2efc40f7e8e41941a81d962208238e13ed0d36 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Wed, 25 Oct 2023 09:18:41 +0200 Subject: [PATCH 3/3] updates for kotlin build --- infrastructure/dind/build.py | 2 +- infrastructure/kotlin/build.py | 3 ++- infrastructure/kotlin/image/resources/install.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/infrastructure/dind/build.py b/infrastructure/dind/build.py index aac3c14..fbe7ca9 100644 --- a/infrastructure/dind/build.py +++ b/infrastructure/dind/build.py @@ -26,7 +26,7 @@ def initialize(project): "image_tag": f"{image_tag}", } - project.build_depends_on("ddadevops>=4.0.0") + project.build_depends_on("ddadevops>=4.7.0") build = DevopsImageBuild(project, input) build.initialize_build_dir() diff --git a/infrastructure/kotlin/build.py b/infrastructure/kotlin/build.py index e487a33..b40b957 100644 --- a/infrastructure/kotlin/build.py +++ b/infrastructure/kotlin/build.py @@ -6,7 +6,8 @@ from ddadevops import * name = "ddadevops" MODULE = "kotlin" PROJECT_ROOT_PATH = "../.." -version = "4.3.2-dev" +version = "4.7.5-dev" + @init def initialize(project): diff --git a/infrastructure/kotlin/image/resources/install.sh b/infrastructure/kotlin/image/resources/install.sh index 202f871..b807340 100755 --- a/infrastructure/kotlin/image/resources/install.sh +++ b/infrastructure/kotlin/image/resources/install.sh @@ -8,7 +8,7 @@ function main() { #install pyb apt -qqy install python3 python3-pip; - pip3 install pybuilder 'ddadevops>=4.2.0' deprecation dda-python-terraform boto3 pyyaml inflection --break-system-packages; + pip3 install pybuilder 'ddadevops>=4.7.0' deprecation dda-python-terraform boto3 pyyaml inflection --break-system-packages; cleanupDocker }