From b3d5d8b1b404e9c16de5b5f6b065b7c08444102f Mon Sep 17 00:00:00 2001
From: Joshua Medley <jmedleyx7@gmail.com>
Date: Thu, 9 Jun 2022 10:39:34 +0100
Subject: [PATCH] add dp-population-types-api to cantabular journey

---
 cantabular-import/.env                        |  2 +-
 .../dp-cantabular-metadata-exporter.yml       | 23 ++++++++++---------
 cantabular-import/dp-population-types-api.yml | 23 +++++++++++++++++++
 3 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 cantabular-import/dp-population-types-api.yml

diff --git a/cantabular-import/.env b/cantabular-import/.env
index a960d0f4..727dbfa5 100644
--- a/cantabular-import/.env
+++ b/cantabular-import/.env
@@ -1,3 +1,3 @@
-COMPOSE_FILE=deps.yml:dp-import-api.yml:dp-import-cantabular-dataset.yml:dp-import-cantabular-dimension-options.yml:dp-cantabular-server.yml:dp-cantabular-api-ext.yml:dp-dataset-api.yml:dp-cantabular-csv-exporter.yml:dp-cantabular-dimension-api.yml:dp-cantabular-filter-flex-api.yml:dp-cantabular-metadata-service.yml:dp-cantabular-metadata-exporter.yml:dp-cantabular-xlsx-exporter.yml:dp-recipe-api.yml:dp-filter-api.yml:zebedee.yml:dp-download-service.yml:dp-frontend-dataset-controller.yml:dp-api-router.yml:dp-frontend-router.yml:dp-publishing-dataset-controller.yml:florence.yml:the-train.yml:babbage.yml:dp-frontend-filter-flex-dataset.yml
+COMPOSE_FILE=deps.yml:dp-import-api.yml:dp-import-cantabular-dataset.yml:dp-import-cantabular-dimension-options.yml:dp-cantabular-server.yml:dp-cantabular-api-ext.yml:dp-dataset-api.yml:dp-cantabular-csv-exporter.yml:dp-cantabular-dimension-api.yml:dp-cantabular-filter-flex-api.yml:dp-cantabular-metadata-service.yml:dp-cantabular-metadata-exporter.yml:dp-cantabular-xlsx-exporter.yml:dp-recipe-api.yml:dp-filter-api.yml:zebedee.yml:dp-download-service.yml:dp-frontend-dataset-controller.yml:dp-api-router.yml:dp-frontend-router.yml:dp-publishing-dataset-controller.yml:florence.yml:the-train.yml:babbage.yml:dp-frontend-filter-flex-dataset.yml:dp-population-types-api.yml
 COMPOSE_PATH_SEPARATOR=:
 COMPOSE_PROJECT_NAME=cantabular-import-journey
diff --git a/cantabular-import/dp-cantabular-metadata-exporter.yml b/cantabular-import/dp-cantabular-metadata-exporter.yml
index fd24106c..43eb63b3 100644
--- a/cantabular-import/dp-cantabular-metadata-exporter.yml
+++ b/cantabular-import/dp-cantabular-metadata-exporter.yml
@@ -21,14 +21,15 @@ services:
             - 26700:26700
         restart: unless-stopped
         environment:
-            BIND_ADDR:              ":26700"
-            KAFKA_ADDR:             "kafka-1:19092,kafka-2:19092,kafka-3:19092"
-            VAULT_ADDR:             "http://vault:8200"
-            DATASET_API_URL:        "http://dp-dataset-api:22000"
-            LOCAL_OBJECT_STORE:     "http://minio:9000"
-            MINIO_ACCESS_KEY:       "minio-access-key"
-            MINIO_SECRET_KEY:       "minio-secret-key"
-            SERVICE_AUTH_TOKEN:     $SERVICE_AUTH_TOKEN
-            VAULT_TOKEN:            "0000-0000-0000-0000"
-            PUBLIC_BUCKET:          "public-bucket"
-            PRIVATE_BUCKET:         "private-bucket"
+            BIND_ADDR:          ":26700"
+            KAFKA_ADDR:         "kafka-1:19092,kafka-2:19092,kafka-3:19092"
+            VAULT_ADDR:         "http://vault:8200"
+            DATASET_API_URL:    "http://dp-dataset-api:22000"
+            FILTER_API_URL:     "http://dp-filter-api:22100"
+            LOCAL_OBJECT_STORE: "http://minio:9000"
+            MINIO_ACCESS_KEY:   "minio-access-key"
+            MINIO_SECRET_KEY:   "minio-secret-key"
+            SERVICE_AUTH_TOKEN: $SERVICE_AUTH_TOKEN
+            VAULT_TOKEN:        "0000-0000-0000-0000"
+            PUBLIC_BUCKET:      "public-bucket"
+            PRIVATE_BUCKET:     "private-bucket"
diff --git a/cantabular-import/dp-population-types-api.yml b/cantabular-import/dp-population-types-api.yml
new file mode 100644
index 00000000..91c07e39
--- /dev/null
+++ b/cantabular-import/dp-population-types-api.yml
@@ -0,0 +1,23 @@
+version: '3.3'
+services:
+    dp-population-types-api:
+        build:
+            context: ../../dp-population-types-api
+            dockerfile: Dockerfile.local
+        command:
+            - reflex
+            - -d
+            - none
+            - -c
+            - ./reflex
+        volumes:
+            - ../../dp-population-types-api:/dp-population-types-api
+        ports:
+            - 12900:12900
+        restart: unless-stopped
+        environment:
+            BIND_ADDR: ":12900"
+            SERVICE_AUTH_TOKEN:     $SERVICE_AUTH_TOKEN
+            DATASET_API_URL:        "http://dp-dataset-api:22000"
+            CANTABULAR_URL:         "http://dp-cantabular-server:8491"
+            CANTABULAR_API_EXT_URL: "http://dp-cantabular-api-ext:8492"