Merge pull request #110 from Tauffer-Consulting/dev

Dev
Tauffer-Consulting · Oct 16, 2023 · dd56e8a · dd56e8a
2 parents 8f494b2 + b8449e4
commit dd56e8a
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/Dockerfile-domino-piece.dev b/Dockerfile-domino-piece.dev
@@ -23,6 +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
diff --git a/Dockerfile-domino-piece.gpu-dev b/Dockerfile-domino-piece.gpu-dev
@@ -35,6 +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
diff --git a/Dockerfile-domino-piece.gpu-prod b/Dockerfile-domino-piece.gpu-prod
@@ -31,6 +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
diff --git a/Dockerfile-domino-piece.prod b/Dockerfile-domino-piece.prod
@@ -19,6 +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
diff --git a/pyproject.toml b/pyproject.toml
@@ -61,14 +61,14 @@ 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",
     "pyOpenSSL==23.1.1",
     "PyGithub==1.55",
     "docker>=6.0.1",
     "kubernetes==23.6.0",
+    "bottle==0.12.25"
 ]
 airflow = [
     "apache-airflow==2.6.3",

diff --git 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')

diff --git a/src/domino/VERSION b/src/domino/VERSION
@@ -1 +1 @@
-0.5.3
+0.5.4
diff --git 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,7 +343,7 @@ def create_platform(install_airflow: bool = True, use_gpu: bool = False) -> None
             "useDefaultImageForMigration": False,
             "airflow": {
                 "repository": domino_airflow_image,
-                "tag": "latest",
+                "tag": domino_airflow_image_tag,
                 "pullPolicy": "IfNotPresent"
             }
         },

diff --git 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):