Update docker-compose files with correct versions

g1raffi · Jul 26, 2023 · 1c61489 · 1c61489
1 parent 68ef8b2
commit 1c61489
Show file tree

Hide file tree

Showing 4 changed files with 155 additions and 40 deletions.
diff --git a/code/debezium/docker/docker-compose.yaml b/code/debezium/docker/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   order:
-    image: microservices-lab-debezium-order:latest
+    image: quay.io/puzzle/microservices-lab-debezium-order:latest
     hostname: order
     container_name: debezium-order
     ports:
@@ -108,7 +108,7 @@ services:
       - QUARKUS_HTTP_PORT=8080
 
   zookeeper:
-    image: quay.io/debezium/zookeeper:1.5
+    image: quay.io/debezium/zookeeper:2.3
     hostname: zookeeper
     container_name: debezium-zookeeper
     networks:
@@ -191,4 +191,4 @@ networks:
   debezium:
     driver: bridge
     ipam:
-      driver: default
+      driver: default
diff --git a/code/kafka/docker/docker-compose.task.yml b/code/kafka/docker/docker-compose.task.yml
@@ -0,0 +1,148 @@
+version: '3'
+
+services:
+  order-db:
+    image: postgres:13
+    volumes:
+      - order-db-data:/var/lib/postgresql/data/
+    networks:
+      - kafka
+    environment:
+      - POSTGRES_USER=admin
+      - POSTGRES_PASSWORD=1234
+    ports:
+      - 5432:5432
+
+  order:
+    image: quay.io/puzzle/microservices-lab-kafka-order:latest
+    ports:
+      - 8080:8080
+    networks:
+      - kafka
+    depends_on:
+      - order-db
+      - kafka
+    environment:
+      - QUARKUS_HTTP_PORT=8080
+      - QUARKUS_DATASOURCE_JDBC_URL=jdbc:tracing:postgresql://order-db:5432/admin
+      - KAFKA_BOOTSTRAP_SERVERS=kafka:9092
+
+  stock-db:
+    image: postgres:13
+    volumes:
+      - stock-db-data:/var/lib/postgresql/data/
+    networks:
+      - kafka
+    environment:
+      - POSTGRES_USER=admin
+      - POSTGRES_PASSWORD=1234
+    ports:
+      - 5433:5432
+
+  stock:
+    image: quay.io/puzzle/microservices-lab-kafka-stock:latest
+    ports:
+      - 8081:8080
+    networks:
+      - kafka
+    depends_on:
+      - stock-db
+      - kafka
+    environment:
+      - QUARKUS_HTTP_PORT=8080
+      - QUARKUS_DATASOURCE_JDBC_URL=jdbc:tracing:postgresql://stock-db:5432/admin
+      - KAFKA_BOOTSTRAP_SERVERS=kafka:9092
+
+  zookeeper:
+    image: quay.io/debezium/zookeeper:2.3
+    hostname: zookeeper
+    container_name: debezium-zookeeper
+    networks:
+      - kafka
+    ports:
+      - 2181:2181
+      - 2888:2888
+      - 3888:3888
+
+  kafka:
+    image: quay.io/puzzle/microservices-lab-debezium-kafka:latest
+    hostname: kafka
+    container_name: debezium-kafka
+    ports:
+      - 9092:9092
+    networks:
+      - kafka
+    depends_on:
+      - zookeeper
+    environment:
+      - ZOOKEEPER_CONNECT=zookeeper:2181
+
+  grafana:
+    image: grafana/grafana:latest
+    ports:
+      - 3000:3000
+    networks:
+      - kafka
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=admin
+    volumes:
+      - ./config/grafana/dashboards/:/opt/dashboards
+      - ./config/grafana/custom.yaml:/etc/grafana/provisioning/dashboards/custom.yaml
+      - ./config/grafana/datasource.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
+
+  prometheus:
+    image: prom/prometheus:latest
+    ports:
+      - 9090:9090
+    networks:
+      - kafka
+    volumes:
+      - ./config/prometheus/prometheus.yaml:/etc/prometheus/prometheus.yml
+      - ./config/prometheus/alert.rules:/etc/prometheus/alert.rules
+
+  alertmanager:
+    image: prom/alertmanager:latest
+    ports:
+      - 9093:9093
+    networks:
+      - kafka
+    volumes:
+      - ./config/alertmanager/alertmanager.yaml:/etc/alertmanager/alertmanager.yml
+
+  jaeger:
+    image: quay.io/jaegertracing/all-in-one:1.24.0
+    networks:
+      - kafka
+    ports:
+      - 5775:5775/udp
+      - 6831:6831/udp
+      - 6832:6832/udp
+      - 5778:5778
+      - 14268:14268
+      - 16686:16686
+
+  viewer:
+    image: quay.io/puzzle/microservices_lab_kafka_viewer:latest
+    ports:
+      - 8082:8080
+    networks:
+      - kafka
+    depends_on:
+      - kafka
+    environment:
+      - QUARKUS_HTTP_PORT=8080
+      - MP_MESSAGING_INCOMING_KAFKAMESSAGES_TOPICS=shop-order-request,shop-order-confirmation,shop-order-compensation
+      - MP_MESSAGING_INCOMING_KAFKAMESSAGES_KEY_DESERIALIZER=org.apache.kafka.common.serialization.StringDeserializer
+      - MP_MESSAGING_INCOMING_KAFKAMESSAGES_VALUE_DESERIALIZER=org.apache.kafka.common.serialization.StringDeserializer
+
+volumes:
+  order-db-data:
+  stock-db-data:
+
+networks:
+  kafka:
+    driver: bridge
+    ipam:
+      driver: default
+
+
diff --git a/code/monolith/docker/docker-compose.yaml b/code/monolith/docker/docker-compose.yaml
@@ -7,8 +7,6 @@ services:
     container_name: monolith-application
     ports:
       - 8080:8080
-    networks:
-      - monolith
     depends_on:
       - application-db
     environment:
@@ -21,8 +19,6 @@ services:
     container_name: monolith-application-db
     volumes:
       - application-db-data:/var/lib/postgresql/data/
-    networks:
-      - monolith
     environment:
       - POSTGRES_USER=admin
       - POSTGRES_PASSWORD=1234
@@ -35,8 +31,6 @@ services:
     container_name: monolith-grafana
     ports:
       - 3000:3000
-    networks:
-      - monolith
     environment:
       - GF_SECURITY_ADMIN_PASSWORD=admin
     volumes:
@@ -50,8 +44,6 @@ services:
     container_name: monolith-prometheus
     ports:
       - 9090:9090
-    networks:
-      - monolith
     volumes:
       - ./config/prometheus/prometheus.yaml:/etc/prometheus/prometheus.yml
       - ./config/prometheus/alert.rules:/etc/prometheus/alert.rules
@@ -62,17 +54,13 @@ services:
     container_name: monolith-alertmanager
     ports:
       - 9093:9093
-    networks:
-      - monolith
     volumes:
       - ./config/alertmanager/alertmanager.yaml:/etc/alertmanager/alertmanager.yml
 
   jaeger:
     image: quay.io/jaegertracing/all-in-one:1.24.0
     hostname: jaeger
     container_name: monolith-jaeger
-    networks:
-      - monolith
     ports:
       - 5775:5775/udp
       - 6831:6831/udp
@@ -86,6 +74,6 @@ volumes:
 
 networks:
   monolith:
-    driver: bridge
-    ipam:
-      driver: default
+    #    driver: bridge
+    #    ipam:
+    #      driver: default
diff --git a/code/rest/docker/docker-compose.solution.yaml b/code/rest/docker/docker-compose.solution.yaml
@@ -2,13 +2,11 @@ version: '3'
 
 services:
   lra-coordinator:
-    image: docker.io/jbosstm/lra-coordinator:5.12.0.Final
+    image: quay.io/jbosstm/lra-coordinator:latest
     hostname: lra-coordinator
     container_name: rest-lra-coordinator
     volumes:
       - lra-data:/opt/jboss
-    networks:
-      - rest
     ports:
       - 8090:8080
     environment:
@@ -20,8 +18,6 @@ services:
     container_name: rest-order
     ports:
       - 8080:8080
-    networks:
-      - rest
     depends_on:
       - order-db
     environment:
@@ -38,8 +34,6 @@ services:
     container_name: rest-stock
     ports:
       - 8081:8080
-    networks:
-      - rest
     depends_on:
       - stock-db
     environment:
@@ -55,8 +49,6 @@ services:
     container_name: rest-order-db
     volumes:
       - order-db-data:/var/lib/postgresql/data/
-    networks:
-      - rest
     environment:
       - POSTGRES_USER=admin
       - POSTGRES_PASSWORD=1234
@@ -69,8 +61,6 @@ services:
     container_name: rest-stock-db
     volumes:
       - stock-db-data:/var/lib/postgresql/data/
-    networks:
-      - rest
     environment:
       - POSTGRES_USER=admin
       - POSTGRES_PASSWORD=1234
@@ -83,8 +73,6 @@ services:
     container_name: rest-grafana
     ports:
       - 3000:3000
-    networks:
-      - rest
     environment:
       - GF_SECURITY_ADMIN_PASSWORD=admin
     volumes:
@@ -98,8 +86,6 @@ services:
     container_name: rest-prometheus
     ports:
       - 9090:9090
-    networks:
-      - rest
     volumes:
       - ./config/prometheus/prometheus.yaml:/etc/prometheus/prometheus.yml
       - ./config/prometheus/alert.rules:/etc/prometheus/alert.rules
@@ -110,17 +96,13 @@ services:
     container_name: rest-alertmanager
     ports:
       - 9093:9093
-    networks:
-      - rest
     volumes:
       - ./config/alertmanager/alertmanager.yaml:/etc/alertmanager/alertmanager.yml
 
   jaeger:
     image: quay.io/jaegertracing/all-in-one:1.24.0
     hostname: jaeger
     container_name: rest-jaeger
-    networks:
-      - rest
     ports:
       - 5775:5775/udp
       - 6831:6831/udp
@@ -136,6 +118,3 @@ volumes:
 
 networks:
   rest:
-    driver: bridge
-    ipam:
-      driver: default