From 746086874b2e8b2fe5103cd17795e4a0ea1c8868 Mon Sep 17 00:00:00 2001 From: Vinicius Vaz Date: Mon, 16 Oct 2023 09:34:00 -0300 Subject: [PATCH 1/6] update default pieces repo version --- rest/core/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest/core/settings.py b/rest/core/settings.py index de1d455c..cee9db72 100644 --- a/rest/core/settings.py +++ b/rest/core/settings.py @@ -50,7 +50,7 @@ class Settings(BaseSettings): # Default domino pieces repository DOMINO_DEFAULT_PIECES_REPOSITORY = os.environ.get('DOMINO_DEFAULT_PIECES_REPOSITORY', "Tauffer-Consulting/default_domino_pieces") - DOMINO_DEFAULT_PIECES_REPOSITORY_VERSION = os.environ.get('DOMINO_DEFAULT_PIECES_REPOSITORY_VERSION', "0.3.12") + DOMINO_DEFAULT_PIECES_REPOSITORY_VERSION = os.environ.get('DOMINO_DEFAULT_PIECES_REPOSITORY_VERSION', "0.3.13") DOMINO_DEFAULT_PIECES_REPOSITORY_SOURCE = os.environ.get('DOMINO_DEFAULT_PIECES_REPOSITORY_SOURCE', "github") DOMINO_DEFAULT_PIECES_REPOSITORY_TOKEN: EmptyStrToNone = os.environ.get('DOMINO_DEFAULT_PIECES_REPOSITORY_TOKEN', "") DOMINO_DEFAULT_PIECES_REPOSITORY_URL: str = os.environ.get('DOMINO_DEFAULT_PIECES_REPOSITORY_URL', 'https://github.com/Tauffer-Consulting/default_domino_pieces') From d81171227bd03d7d39e078ac480bae44a29ed511 Mon Sep 17 00:00:00 2001 From: Vinicius Vaz Date: Mon, 16 Oct 2023 09:58:53 -0300 Subject: [PATCH 2/6] removing duplicated tag from airflow image --- src/domino/cli/utils/platform.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/domino/cli/utils/platform.py b/src/domino/cli/utils/platform.py index e529e015..bd11837e 100644 --- a/src/domino/cli/utils/platform.py +++ b/src/domino/cli/utils/platform.py @@ -343,7 +343,6 @@ def create_platform(install_airflow: bool = True, use_gpu: bool = False) -> None "useDefaultImageForMigration": False, "airflow": { "repository": domino_airflow_image, - "tag": "latest", "pullPolicy": "IfNotPresent" } }, From 0623798738a70d04c312262eda0e04096e581c64 Mon Sep 17 00:00:00 2001 From: Vinicius Vaz Date: Mon, 16 Oct 2023 10:18:01 -0300 Subject: [PATCH 3/6] fix tags --- src/domino/cli/utils/platform.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/domino/cli/utils/platform.py b/src/domino/cli/utils/platform.py index bd11837e..e9a660a4 100644 --- a/src/domino/cli/utils/platform.py +++ b/src/domino/cli/utils/platform.py @@ -230,14 +230,14 @@ def create_platform(install_airflow: bool = True, use_gpu: bool = False) -> None local_domino_frontend_image = platform_config.get('dev', {}).get('DOMINO_FRONTEND_IMAGE', None) local_domino_rest_image = platform_config.get('dev', {}).get('DOMINO_REST_IMAGE', None) + domino_airflow_image_tag = 'latest' + domino_airflow_image = "ghcr.io/tauffer-consulting/domino-airflow-base" if local_domino_airflow_image: console.print(f"Loading local Domino Airflow image {local_domino_airflow_image} to Kind cluster...") subprocess.run(["kind", "load", "docker-image", local_domino_airflow_image , "--name", cluster_name, "--nodes", f"{cluster_name}-worker"]) domino_airflow_image = f'docker.io/library/{local_domino_airflow_image}' - elif platform_config['kind']["DOMINO_DEPLOY_MODE"] == 'local-k8s-dev': - domino_airflow_image = "ghcr.io/tauffer-consulting/domino-airflow-base:latest-dev" - else: - domino_airflow_image = "ghcr.io/tauffer-consulting/domino-airflow-base:latest" + elif platform_config['kind']["DOMINO_DEPLOY_MODE"] == 'local-k8s-dev' and not local_domino_airflow_image: + domino_airflow_image_tag = 'latest-dev' if local_domino_frontend_image: console.print(f"Loading local frontend image {local_domino_frontend_image} to Kind cluster...") @@ -343,6 +343,7 @@ def create_platform(install_airflow: bool = True, use_gpu: bool = False) -> None "useDefaultImageForMigration": False, "airflow": { "repository": domino_airflow_image, + "tag": domino_airflow_image_tag, "pullPolicy": "IfNotPresent" } }, From 4615465463d2dde53ebb3c4457382e6feb7198e8 Mon Sep 17 00:00:00 2001 From: Vinicius Vaz Date: Mon, 16 Oct 2023 10:27:40 -0300 Subject: [PATCH 4/6] add cli to pieces images --- Dockerfile-domino-piece.dev | 1 + Dockerfile-domino-piece.gpu-dev | 1 + Dockerfile-domino-piece.gpu-prod | 3 ++- Dockerfile-domino-piece.prod | 3 ++- src/domino/client/github_rest_client.py | 1 - 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile-domino-piece.dev b/Dockerfile-domino-piece.dev index 8f8ada0a..5979775b 100644 --- a/Dockerfile-domino-piece.dev +++ b/Dockerfile-domino-piece.dev @@ -24,5 +24,6 @@ COPY src/domino /home/domino/domino_py/src/domino WORKDIR /home/domino/domino_py RUN chmod -R 777 . RUN pip install --no-cache -e .[piece] +RUN pip install --no-cache -e .[cli] WORKDIR /home \ No newline at end of file diff --git a/Dockerfile-domino-piece.gpu-dev b/Dockerfile-domino-piece.gpu-dev index dea6af7b..9e9de482 100644 --- a/Dockerfile-domino-piece.gpu-dev +++ b/Dockerfile-domino-piece.gpu-dev @@ -36,5 +36,6 @@ COPY src/domino /home/domino/domino_py/src/domino WORKDIR /home/domino/domino_py RUN chmod -R 777 . RUN pip install --no-cache -e .[piece] +RUN pip install --no-cache -e .[cli] WORKDIR /home \ No newline at end of file diff --git a/Dockerfile-domino-piece.gpu-prod b/Dockerfile-domino-piece.gpu-prod index 48f1437e..9fb14010 100644 --- a/Dockerfile-domino-piece.gpu-prod +++ b/Dockerfile-domino-piece.gpu-prod @@ -31,6 +31,7 @@ RUN chmod -R 777 . # pip install Domino from PyPI RUN python3 -m pip install --upgrade pip \ - pip install domino-py[piece] + pip install domino-py[piece] \ + pip install domino-py[cli] WORKDIR /home \ No newline at end of file diff --git a/Dockerfile-domino-piece.prod b/Dockerfile-domino-piece.prod index 7eb07f9d..88ddd271 100644 --- a/Dockerfile-domino-piece.prod +++ b/Dockerfile-domino-piece.prod @@ -19,6 +19,7 @@ RUN chmod -R 777 . # pip install Domino from PyPI RUN /usr/local/bin/python -m pip install --upgrade pip \ - pip install domino-py[piece] + pip install domino-py[piece] \ + pip install domino-py[cli] WORKDIR /home \ No newline at end of file diff --git a/src/domino/client/github_rest_client.py b/src/domino/client/github_rest_client.py index cbc91ba1..ed4a21ed 100644 --- a/src/domino/client/github_rest_client.py +++ b/src/domino/client/github_rest_client.py @@ -1,5 +1,4 @@ from github import Github -import os class GithubRestClient(Github): From 69c0f042d6f280325b6201b9bfcc4481a28f35ad Mon Sep 17 00:00:00 2001 From: Vinicius Vaz Date: Mon, 16 Oct 2023 10:47:04 -0300 Subject: [PATCH 5/6] cli with bottle --- Dockerfile-domino-piece.dev | 1 - Dockerfile-domino-piece.gpu-dev | 1 - Dockerfile-domino-piece.gpu-prod | 1 - Dockerfile-domino-piece.prod | 1 - pyproject.toml | 2 +- 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile-domino-piece.dev b/Dockerfile-domino-piece.dev index 5979775b..bec67a3d 100644 --- a/Dockerfile-domino-piece.dev +++ b/Dockerfile-domino-piece.dev @@ -23,7 +23,6 @@ COPY pyproject.toml /home/domino/domino_py/ COPY src/domino /home/domino/domino_py/src/domino WORKDIR /home/domino/domino_py RUN chmod -R 777 . -RUN pip install --no-cache -e .[piece] RUN pip install --no-cache -e .[cli] WORKDIR /home \ No newline at end of file diff --git a/Dockerfile-domino-piece.gpu-dev b/Dockerfile-domino-piece.gpu-dev index 9e9de482..f183ce63 100644 --- a/Dockerfile-domino-piece.gpu-dev +++ b/Dockerfile-domino-piece.gpu-dev @@ -35,7 +35,6 @@ COPY pyproject.toml /home/domino/domino_py/ COPY src/domino /home/domino/domino_py/src/domino WORKDIR /home/domino/domino_py RUN chmod -R 777 . -RUN pip install --no-cache -e .[piece] RUN pip install --no-cache -e .[cli] WORKDIR /home \ No newline at end of file diff --git a/Dockerfile-domino-piece.gpu-prod b/Dockerfile-domino-piece.gpu-prod index 9fb14010..ac9f54ab 100644 --- a/Dockerfile-domino-piece.gpu-prod +++ b/Dockerfile-domino-piece.gpu-prod @@ -31,7 +31,6 @@ RUN chmod -R 777 . # pip install Domino from PyPI RUN python3 -m pip install --upgrade pip \ - pip install domino-py[piece] \ pip install domino-py[cli] WORKDIR /home \ No newline at end of file diff --git a/Dockerfile-domino-piece.prod b/Dockerfile-domino-piece.prod index 88ddd271..3c1992c0 100644 --- a/Dockerfile-domino-piece.prod +++ b/Dockerfile-domino-piece.prod @@ -19,7 +19,6 @@ RUN chmod -R 777 . # pip install Domino from PyPI RUN /usr/local/bin/python -m pip install --upgrade pip \ - pip install domino-py[piece] \ pip install domino-py[cli] WORKDIR /home \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 58cd2fc1..3d5e71de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,7 +61,6 @@ readme = { file = 'README.md', content-type = 'text/markdown' } domino = "domino.cli.cli:cli" [project.optional-dependencies] -piece = ["bottle==0.12.25"] cli = [ "urllib3== 1.26.15", "cryptography==39.0.1", @@ -69,6 +68,7 @@ cli = [ "PyGithub==1.55", "docker>=6.0.1", "kubernetes==23.6.0", + "bottle==0.12.25" ] airflow = [ "apache-airflow==2.6.3", From b8449e42f4ef32f8e031be511cb145d2f176408f Mon Sep 17 00:00:00 2001 From: Vinicius Vaz Date: Mon, 16 Oct 2023 10:55:35 -0300 Subject: [PATCH 6/6] update version --- src/domino/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/domino/VERSION b/src/domino/VERSION index c52db980..167b000b 100644 --- a/src/domino/VERSION +++ b/src/domino/VERSION @@ -1 +1 @@ -0.5.3 \ No newline at end of file +0.5.4 \ No newline at end of file