Updated docker strategy

JeffersonLab · Feb 21, 2022 · 3fd36cc · 3fd36cc
1 parent d888ca2
commit 3fd36cc
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 44 deletions.
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
diff --git a/docker-compose.deps.yml b/docker-compose.deps.yml
@@ -0,0 +1,39 @@
+---
+version: '3.9'
+
+services:
+  softioc:
+    image: slominskir/softioc:1.1.0
+    tty: true
+    stdin_open: true
+    hostname: softioc
+    container_name: softioc
+    ports:
+      - "5064:5064/tcp"
+      - "5065:5065/tcp"
+      - "5064:5064/udp"
+      - "5065:5065/udp"
+    volumes:
+      - ./examples/softioc-db:/db
+      - ./examples/softioc-scripts:/scripts
+
+  zookeeper:
+    image: debezium/zookeeper:1.5.0.Final
+    hostname: zookeeper
+    container_name: zookeeper
+    ports:
+      - "2181:2181"
+      - "2888:2888"
+      - "3888:3888"
+
+  kafka:
+    image: debezium/kafka:1.5.0.Final
+    hostname: kafka
+    container_name: kafka
+    depends_on:
+      - zookeeper
+    ports:
+      - "9092:9092"
+    environment:
+      ZOOKEEPER_CONNECT: 'zookeeper:2181'
+      CREATE_TOPICS: 'channels:1:1:compact,topic1:1:1:compact,topic2:1:1:compact,topic3:1:1:compact'
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -0,0 +1,29 @@
+---
+version: '3.9'
+
+services:
+  softioc:
+    extends:
+      file: docker-compose.yml
+      service: softioc
+
+  zookeeper:
+    extends:
+      file: docker-compose.yml
+      service: zookeeper
+
+  kafka:
+    extends:
+      file: docker-compose.yml
+      service: kafka
+
+  connect:
+    extends:
+      file: docker-compose.yml
+      service: connect
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ./build/install:/kafka/connect
+      - ./scripts:/scripts
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -0,0 +1,6 @@
+---
+version: '3.9'
+
+services:
+  connect:
+    image: slominskir/epics2kafka:1.2.0
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,49 +1,23 @@
 ---
-version: '3.8'
+version: '3.9'
 
 services:
   softioc:
-    image: slominskir/softioc:1.1.0
-    tty: true
-    stdin_open: true
-    hostname: softioc
-    container_name: softioc
-    ports:
-      - "5064:5064/tcp"
-      - "5065:5065/tcp"
-      - "5064:5064/udp"
-      - "5065:5065/udp"
-    volumes:
-      - ./examples/softioc-db:/db
-      - ./examples/softioc-scripts:/scripts
+    extends:
+      file: docker-compose.deps.yml
+      service: softioc
 
   zookeeper:
-    image: debezium/zookeeper:1.5.0.Final
-    hostname: zookeeper
-    container_name: zookeeper
-    ports:
-      - "2181:2181"
-      - "2888:2888"
-      - "3888:3888"
+    extends:
+      file: docker-compose.deps.yml
+      service: zookeeper
 
   kafka:
-    image: debezium/kafka:1.5.0.Final
-    hostname: kafka
-    container_name: kafka
-    depends_on:
-      - zookeeper
-    ports:
-      - "9092:9092"
-    environment:
-      ZOOKEEPER_CONNECT: 'zookeeper:2181'
-      CREATE_TOPICS: 'channels:1:1:compact,topic1:1:1:compact,topic2:1:1:compact,topic3:1:1:compact'
+    extends:
+      file: docker-compose.deps.yml
+      service: kafka
 
   connect:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        - CUSTOM_CRT_URL=http://pki.jlab.org/JLabCA.crt
     hostname: connect
     container_name: connect
     depends_on:
@@ -61,4 +35,3 @@ services:
       MONITOR_CHANNELS: "channel1|topic1|v|key1,channel2|topic2|v|key2,channel3|topic3|v|key3"
     volumes:
       - ./examples/connect-config/distributed:/config
-      - ./scripts:/scripts