Feature/homepage publishing deps plus web

v2/manifests/core-ons/babbage.yml

@@ -34,3 +34,29 @@ services:
       interval: ${HEALTHCHECK_INTERVAL:-30s}
       timeout: 10s
       retries: 10
+  babbage-web:
+    build:
+      context: ${DP_REPO_DIR:-../../../..}/babbage
+      dockerfile: Dockerfile.local
+    expose:
+      - "8080"
+    ports:
+      - "8088:8080"
+    restart: unless-stopped
+    environment:
+      JAVA_OPTS:                " -Xmx512m -Xdebug -Xrunjdwp:transport=dt_socket,address=8010,server=y,suspend=n"
+      RESTOLINO_STATIC:         "target/web"
+      RESTOLINO_CLASSES:        "target/classes"
+      PACKAGE_PREFIX:           "com.github.onsdigital"
+      DP_COLOURED_LOGGING:      "true"
+      DP_LOGGING_FORMAT:        "pretty_json"
+      DEV_ENVIRONMENT:          "Y"
+      IS_PUBLISHING:            "N"
+      RELOAD_TEMPLATES:         "Y"
+      TEMPLATES_DIR_KEY:        "target/web/templates/handlebars"
+      ENABLE_COVID19_FEATURE:   "false"
+      ENABLE_CACHE:             "Y"
+      ENABLE_METRICS:           "Y"
+      CONTENT_SERVICE_URL:      ${ZEBEDEE_URL:-http://zebedee-reader:8082}
+      HIGHCHARTS_EXPORT_SERVER: ${HIGHCHARTS_EXPORT_SERVER:-http://highcharts:9999/}
+      ELASTIC_SEARCH_SERVER:    ${ELASTIC_SEARCH_SERVER:-elasticsearch-web}

v2/manifests/core-ons/zebedee-reader.yml

@@ -7,8 +7,7 @@ services:
     expose:
       - "8082"
     ports:
-      - 8082:8082
-      - 8002:8002
+      - 18082:8082
     volumes:
       - ${zebedee_root:?please define a valid zebedee_root in your local system}:/zebedee_root
     restart: unless-stopped

v2/manifests/core-ons/zebedee.yml

@@ -34,6 +34,7 @@ services:
       db_audit_username:              "postgres"
       db_audit_password:              "postgres"
       publish_url:                    ${PUBLISH_URL:-http://the-train:8084}
+      website_url:                    ${website_url:-http://babbage-web:8080}
       ENABLE_CENTRALISED_KEYRING:     "true"
       KEYRING_SECRET_KEY:             "38c03PzhNuSrYV8J0537XQ=="
       KEYRING_INIT_VECTOR:            "RkL9MmjfRcPB86alO82gHQ=="

v2/manifests/deps/elasticsearch.yml

@@ -13,6 +13,22 @@ services:
       timeout: 10s
       retries: 10
 
+  elasticsearch-web:
+    image: elasticsearch:2.4.2
+    expose:
+      - "9200"
+      - "9300"
+    ports:
+      - "9308:9300"
+      - "9208:9200"
+    environment:
+      - "discovery.type=single-node"
+    healthcheck:
+      test: ["CMD", "curl", "-sSf", "http://localhost:9200/_cluster/health?wait_for_status=yellow"]
+      interval: 60s
+      timeout: 10s
+      retries: 10
+
   sitewideelasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0
     expose:

v2/stacks/homepage-publishing/core-ons.yml

@@ -24,8 +24,17 @@ services:
     depends_on:
       dp-api-router:
         condition: service_healthy
-    environment:
-      IS_PUBLISHING: "Y"
+      elasticsearch:
+        condition: service_healthy
+  babbage-web:
+    extends:
+      file: ${PATH_MANIFESTS}/core-ons/babbage.yml
+      service: babbage-web
+    depends_on:
+      babbage:
+        condition: service_healthy
+      zebedee-reader:
+        condition: service_healthy
   the-train:
     extends:
       file: ${PATH_MANIFESTS}/core-ons/the-train.yml
@@ -47,6 +56,15 @@ services:
     depends_on:
       zebedee:
         condition: service_healthy
+  dp-files-api:
+    extends:
+      file: ${PATH_MANIFESTS}/core-ons/dp-files-api.yml
+      service: dp-files-api
+    environment:
+      KAFKA_ADDR: 'kafka-1:9092,kafka-2:9093,kafka-3:9094'
+    depends_on:
+      dp-api-router:
+        condition: service_healthy
   dp-topic-api:
     extends:
       file: ${PATH_MANIFESTS}/core-ons/dp-topic-api.yml
@@ -61,6 +79,13 @@ services:
     depends_on:
       elasticsearch:
         condition: service_started
+  zebedee-reader:
+    extends:
+      file: ${PATH_MANIFESTS}/core-ons/zebedee-reader.yml
+      service: zebedee-reader
+    depends_on:
+      elasticsearch-web:
+        condition: service_started
   florence:
     extends:
       file: ${PATH_MANIFESTS}/core-ons/florence.yml
@@ -82,3 +107,15 @@ services:
     depends_on:
       dp-image-api:
         condition: service_healthy
+  dp-dataset-api:
+    extends:
+      file: ${PATH_MANIFESTS}/core-ons/dp-dataset-api.yml
+      service: dp-dataset-api
+    environment:
+      DISABLE_GRAPH_DB_DEPENDENCY: false
+    extra_hosts:
+      - "host.docker.internal:host-gateway"          # localhost mapping for linux
+      - "docker.for.mac.host.internal:host-gateway"  # localhost mapping for mac (docker v17.12 to v18.02)
+    depends_on:
+      zebedee:
+        condition: service_healthy

v2/stacks/homepage-publishing/deps.yml

@@ -41,3 +41,15 @@ services:
     extends:
       file: ${PATH_MANIFESTS}/deps/elasticsearch.yml
       service: elasticsearch
+  elasticsearch-web:
+    extends:
+      file: ${PATH_MANIFESTS}/deps/elasticsearch.yml
+      service: elasticsearch-web
+  localstack:
+    extends:
+      file: ${PATH_MANIFESTS}/deps/localstack.yml
+      service: localstack
+  sitewideelasticsearch:
+    extends:
+      file: ${PATH_MANIFESTS}/deps/elasticsearch.yml
+      service: sitewideelasticsearch