Merge pull request #59 from odpi/supporting-open-lineage

Several minor configuration updates
odpi · Jan 2, 2025 · 56c6930 · 56c6930
2 parents 64e1290 + f01b6ac
commit 56c6930
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 495 deletions.
diff --git a/compose-configs/egeria-platform-compose/egeria-platform-compose.yaml b/compose-configs/egeria-platform-compose/egeria-platform-compose.yaml
@@ -33,19 +33,37 @@ services:
              - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9193
              - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
 
-    egeria-platform:
-        depends_on:
-            - kafka
-        image: 'docker.io/odpi/egeria-platform:latest'
-        ports:
-            - '9443:9443'
-
-
-        # Persistence
-#        volumes:
-#            - "YOUR DATA DIRECTORY"/data:/deployments/data
-#            - "YOUR EXTRA LIBRARY DIRECTORY"/extra:/deployments/extra
-#            - "ANOTHER DIRECTOR TO MOUNT"/:/deployments/user_mount
+    egeria-platform-basic:
+            depends_on:
+                - kafka
+            image: 'docker.io/odpi/egeria-platform:latest'
+            ports:
+                - '9443:9443'
+                - '5005:5005'
+            environment:
+                - XTDB_ENABLE_BYTEUTILS_SHA1=True
+                - XTDB_DISABLE_LIBCRYPTO=True
+                - startup.server.list=active-metadata-store,engine-host,integration-daemon,view-server,simple-metadata-store
+                - server.port=9443
+
+            healthcheck:
+                test: curl -k -X GET "https://localhost:9443/open-metadata/platform-services/users/garygeeke/server-platform/origin" || exit 1
+                interval: 20s
+                timeout: 10s
+                retries: 3
+                start_period: 10s
+
+
+            volumes:
+                - ../../exchange/landing-area:/deployments/landing-area
+                - ../../exchange/distribution-hub:/deployments/distribution-hub
+                - ../../exchange/distribution-hub/surveys:/deployments/surveys
+                - ../../exchange/distribution-hub/logs:/deployments/logs
+                - ../../runtime-volumes/egeria-platform-data/data:/deployments/data
+                - ../../exchange/loading-bay:/deployments/loading-bay
+                - ../../work:/deployments/work
+
+
 
 
 #

diff --git a/compose-configs/egeria-platform-jupyter-compose/Dockerfile-jupyter b/compose-configs/egeria-platform-jupyter-compose/Dockerfile-jupyter
@@ -45,7 +45,7 @@ ARG py_ver=3.12
 #     echo conda activate "${env_name}" >> "/home/${NB_USER}/.bashrc"
 #
 #USER ${NB_UID}
-RUN pip install --no-cache-dir 'pyegeria>=1.5.1.1.57'
+RUN pip install --no-cache-dir 'pyegeria'
 RUN pip install --no-cache-dir 'rich'
 RUN pip install --no-cache-dir 'unitycatalog'
 RUN pip install --no-cache-dir 'pipx'

diff --git a/compose-configs/egeria-platform-jupyter-compose/application.properties b/compose-configs/egeria-platform-jupyter-compose/application.properties
diff --git a/compose-configs/egeria-platform-jupyter-compose/before-notebook.d/config-jupyter.sh b/compose-configs/egeria-platform-jupyter-compose/before-notebook.d/config-jupyter.sh
@@ -30,6 +30,7 @@ export EGERIA_USER='erinoverview'
 export EGERIA_USER_PASSWORD='secret'
 export EGERIA_JUPYTER='True'
 export EGERIA_WIDTH='200'
+export EGERIA_HOME_GLOSSARY_GUID='30bfe79e-adf2-4fda-b9c5-9c86ad6b0d6c'
 
 
 
diff --git a/compose-configs/egeria-platform-jupyter-compose/egeria-platform-jupyter-compose.yaml b/compose-configs/egeria-platform-jupyter-compose/egeria-platform-jupyter-compose.yaml
@@ -11,7 +11,7 @@
 #   * Uninstall the containers by issuing 'docker compose -f ./egeria-platform-jupyter-uc-compose.yaml down'
 #
 # Assumptions:
-#   * Ports 7443, 7444, 7445 and 9192 are available on the host system - these are the default ports for Kafka and Egeria.
+#   * Ports 9443 and 9192 are available on the host system - these are the default ports for Kafka and Egeria.
 #   * by default, the jupyter notebooks in the 'coco-jupyter-labs' folder are mounted and available for use by the jupyter notebooks
 #   * by default, strict SSL validation is turned off
 #
@@ -25,6 +25,8 @@ services:
 
         image: quay.io/jupyter/scipy-notebook
         container_name: jupyter-work
+        networks:
+            - egeria_network
         ports:
             - 8888:8888
         environment:
@@ -44,11 +46,11 @@ services:
 
     kafka:
          image: 'bitnami/kafka:latest'
+         networks:
+             - egeria_network
          ports:
              - '9192:9192'
              - '9194:9194'
-         networks:
-             - egeria_network
          environment:
              - KAFKA_CFG_NODE_ID=0
              - KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE=true
@@ -64,10 +66,12 @@ services:
         depends_on:
             - kafka
         image: 'docker.io/odpi/egeria-platform:latest'
-        ports:
-            - '9443:9443'
+
         networks:
             - egeria_network
+        ports:
+            - '9443:9443'
+            - '5005:5005'
         environment:
             - XTDB_ENABLE_BYTEUTILS_SHA1=True
             - XTDB_DISABLE_LIBCRYPTO=True

diff --git a/compose-configs/egeria-platform-jupyter-proxy-pg-compose/Dockerfile-jupyter b/compose-configs/egeria-platform-jupyter-proxy-pg-compose/Dockerfile-jupyter
@@ -46,7 +46,7 @@ ENV JUPYTER_ENABLE_LAB=yes
 #     echo conda activate "${env_name}" >> "/home/${NB_USER}/.bashrc"
 #
 #USER ${NB_UID}
-RUN pip install --no-cache-dir 'pyegeria>=5.2.0.5'
+RUN pip install --no-cache-dir 'pyegeria'
 RUN pip install --no-cache-dir 'rich'
 RUN pip install --no-cache-dir 'unitycatalog'
 RUN pip install --no-cache-dir 'pipx'