Added support to API config to check for environment variable for kaf…

…ka broker ports
NextCenturyCorporation · Apr 30, 2018 · b2ba4b8 · b2ba4b8
1 parent dd5938f
commit b2ba4b8
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 8 deletions.
diff --git a/control/api_server/config/config.exs b/control/api_server/config/config.exs
@@ -5,12 +5,22 @@
 # is restricted to this project.
 use Mix.Config
 
+kafka_boostraps =
+
+  case System.get_env("KAFKA_BOOTSTRAP_PORT") do
+    nil ->
+      "sensing-kafka.savior.internal:9555"
+    p ->
+      "sensing-kafka.savior.internal:#{p}"
+  end
+
+
 # General application configuration
 config :api_server,
   ecto_repos: [ApiServer.Repo],
   c2_kafka_topic: "api-server-control",
-  sensor_kafka_bootstrap: ["sensing-kafka.savior.internal:9555"],
-  client_kafka_bootstrap: ["sensing-kafka.savior.internal:9555"],
+  sensor_kafka_bootstrap: [kafka_boostraps],
+  client_kafka_bootstrap: [kafka_boostraps],
   ca_cert_file: "/app/certs/ca.pem",
   cfssl_host: "cfssl",
   cfssl_port: 3030,

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,13 @@ services:
     image: wurstmeister/zookeeper
     ports:
       - "2181:2181"
+    networks:
+      apinet:
+        aliases:
+          - zookeeper
   kafka:
+    image: 127.0.0.1:5000/savior-kafka
+    hostname: sensing-kafka.savior.internal
     build:
       context: "./control/logging"
       dockerfile: Dockerfile
@@ -15,52 +21,90 @@ services:
         mode: host
     environment:
       CFSSL_SHARED_SECRET: "de1069ab43f7f385d9a31b76af27e7620e9aa2ad5dccd264367422a452aba67f"
-      HOSTNAME_COMMAND: "docker info | grep ^Name: | cut -d' ' -f 2"      
+      HOSTNAME_COMMAND: echo -n "sensing-kafka.savior.internal"
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_ADVERTISED_LISTENERS: INSIDE://_{HOSTNAME_COMMAND}:9455,OUTSIDE://_{HOSTNAME_COMMAND}:9555
+      KAFKA_LISTENERS: INSIDE://_{HOSTNAME_COMMAND}:9455,OUTSIDE://_{HOSTNAME_COMMAND}:9555
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INSIDE:SSL,OUTSIDE:SSL
       KAFKA_ADVERTISED_PROTOCOL_NAME: OUTSIDE
       KAFKA_ADVERTISED_PORT: 9555
       KAFKA_PROTOCOL_NAME: INSIDE
       KAFKA_PORT: 9455
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      apinet:
+        aliases:
+          - kafka
+          - sensing-kafka.savior.internal
   cfssl:
+    image: 127.0.0.1:5000/savior-cfssl
     build: "./control/savior-ca"
     ports:
       - "3030:3030"
+    networks:
+      apinet:
+        aliases:
+          - cfssl
+          - sensing-ca.savior.internal
   api:
+    image: 127.0.0.1:5000/savior-api
     build: "./control/api_server"
     ports:
       - "17141:17141"
       - "17504:17504"
     environment:
       CFSSL_SHARED_SECRET: "de1069ab43f7f385d9a31b76af27e7620e9aa2ad5dccd264367422a452aba67f"
+      SWARM_HOST: ${SWARM_HOSTNAME}
+      KAFKA_BOOTSTRAP_PORT: "9455"
     depends_on:
       - kafka
       - cfssl
       - api_server_postgres
-    links:
-      - "kafka:kafka"
-      - "cfssl:cfssl"
+    networks:
+      apinet:
+        aliases:
+          - api
+          - sensing-api.savior.internal
   dropper_callback:
+    image: 127.0.0.1:5000/dropper-callback
     build: "./external/dropper_callback"
     ports:
       - "8080:8080"
     # hostname: dropper1
     # domainname: evil.io
+    networks:
+      apinet:
+        aliases:
+          - dropper_callback
   target_1:
+    image: 127.0.0.1:5000/demo-target
     build: "./targets/demo-target"
     depends_on:
       - kafka
       - api
     stdin_open: true
     tty: true
+    networks:
+      apinet:
+        aliases:
+          - target_1
   api_server_postgres:
     image: postgres:9.3
     volumes:
-      - ./pgdata:/var/lib/postgresql/data/pgdata
+      - db-data:/var/lib/postgresql/data/pgdata
     environment:
       POSTGRES_PASSWORD: "postgres"
       POSTGRES_USER: "postgres"
       PGDATA: "/var/lib/postgresql/data/pgdata"
-      POSTGRES_DB: "api_server_postgres"
+      POSTGRES_DB: "api_server_postgres"
+    networks:
+      apinet:
+        aliases:
+          - api_server_postgres
+          - postgres
+volumes:
+  db-data:
+networks:
+  apinet:
+    external: true