Merge pull request #1 from code-kern-ai/third-party-versions

Add versions of third party services to template

Author: FelixKirsch

replace_release_build

@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   kratos-migrate:
-    image: oryd/kratos:v0.8.0-alpha.2-sqlite
+    image: oryd/kratos:{KRATOS}
     environment:
       - DSN=sqlite:///var/lib/sqlite/db.sqlite?_fk=true&mode=rwc
     volumes:
@@ -19,7 +19,7 @@ services:
   kratos:
     depends_on:
       - kratos-migrate
-    image: oryd/kratos:v0.8.0-alpha.2-sqlite
+    image: oryd/kratos:{KRATOS}
     restart: unless-stopped
     environment:
       - DSN=sqlite:///var/lib/sqlite/db.sqlite?_fk=true
@@ -33,7 +33,7 @@ services:
       - default
 
   oathkeeper:
-    image: oryd/oathkeeper:v0.38.15-beta.1
+    image: oryd/oathkeeper:{OATHKEEPER}
     depends_on:
       - kratos
     ports:
@@ -56,7 +56,7 @@ services:
       - default
 
   mailhog:
-    image: mailhog/mailhog:latest
+    image: mailhog/mailhog:{MAILHOG}
     ports:
       - 1025:1025
       - 4436:8025
@@ -132,7 +132,7 @@ services:
       - default
 
   graphql-postgres:
-    image: docker.io/postgres:13
+    image: docker.io/postgres:{POSTGRES}
     restart: always
     ports:
       - 7052:5432
@@ -147,7 +147,7 @@ services:
       - {LOCAL_VOLUME_POSTGRES}:/var/lib/postgresql/data
 
   qdrant:
-    image: qdrant/qdrant:v0.9.1
+    image: qdrant/qdrant:{QDRANT}
     restart: always
     ports:
       - 6333:6333
@@ -176,7 +176,7 @@ services:
       - default
 
   object-storage:
-    image: docker.io/minio/minio:latest
+    image: docker.io/minio/minio:{MINIO}
     restart: always
     ports:
       - 7053:9000

templates/docker-compose.yml

@@ -12,5 +12,7 @@
 JWKS_PATH = "/refinery/oathkeeper/jwks.json"
 PG_CONTAINER = "graphql-postgres"
 POSTGRES_MIGRATE_CONTAINER = "postgres-migrate"
+REFINERY = "REFINERY"
 SERVICE_VERSIONS = "/refinery/versions.json"
 SETTINGS = "/refinery/settings.json"
+THIRD_PARTY = "THIRD_PARTY"

util/constants.py

@@ -9,14 +9,15 @@
     SERVICE_VERSIONS,
     JWKS_PATH,
     POSTGRES_MIGRATE_CONTAINER,
+    REFINERY,
 )
 
 client = docker.from_env()
 
 
 def check_and_pull_exec_env_images() -> None:
     with open(SERVICE_VERSIONS, "r") as f:
-        versions = json.load(f)
+        versions = json.load(f)[REFINERY]
 
     for exec_env, image_name in EXEC_ENVS.items():
         image_tag = versions[exec_env]

util/docker_helper.py

@@ -4,7 +4,13 @@
 from datetime import datetime
 from typing import Dict
 from zipfile import ZipFile
-from util.constants import BACKUP_DIR, CONNECTION_STRING, PG_CONTAINER, SERVICE_VERSIONS
+from util.constants import (
+    BACKUP_DIR,
+    CONNECTION_STRING,
+    PG_CONTAINER,
+    SERVICE_VERSIONS,
+    REFINERY,
+)
 from util.docker_helper import exec_command_on_container
 
 
@@ -61,7 +67,7 @@ def get_db_versions() -> Dict[str, str]:
 def update_db_versions() -> bool:
 
     with open(SERVICE_VERSIONS, "r") as f:
-        current_versions = json.load(f)
+        current_versions = json.load(f)[REFINERY]
     db_versions = get_db_versions()
 
     # update existing service versions

util/postgres_helper.py

@@ -6,6 +6,8 @@
     DOCKER_COMPOSE_TEMPLATE,
     SERVICE_VERSIONS,
     SETTINGS,
+    REFINERY,
+    THIRD_PARTY,
 )
 from util.docker_helper import get_credential_ip
 
@@ -27,7 +29,8 @@ def process_docker_compose_template(refinery_dir: str, minio_endpoint: str) -> N
             settings[volume] = os.path.normpath(os.path.join(refinery_dir, rel_path))
 
     docker_compose = template.format(
-        **versions,
+        **versions[REFINERY],
+        **versions[THIRD_PARTY],
         **settings,
         **{
             "CRED_ENDPOINT": cred_endpoint,

util/template_processor.py

@@ -1,14 +1,14 @@
 import json
 import time
 from typing import List
-from util.constants import SERVICE_VERSIONS
+from util.constants import SERVICE_VERSIONS, REFINERY
 from util.docker_helper import is_uvicorn_application_started, exec_command_on_container
 from util.postgres_helper import get_db_versions, wait_until_postgres_is_ready
 
 
 def is_any_service_version_changed() -> bool:
     with open(SERVICE_VERSIONS, "r") as f:
-        current_versions = json.load(f)
+        current_versions = json.load(f)[REFINERY]
 
     db_versions = get_db_versions()