Commit ac647896 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Expresa variables de entorno como diccionario 

En formato array no es posible realizar las mezclas de extensiones
YAML.
parent 78513ab3

kafka/docker-compose.dev.yml

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ version: '3.5' 


x-dev-environment:

  &dev-environment

  - KAFKA_HEAP_OPTS=-Xmx512m -Xms512m

  KAFKA_HEAP_OPTS: '-Xmx512m -Xms512m'



x-dev-deploy:

  &dev-deploy
@@ -22,7 +22,7 @@ services: 
  kf-1:

    environment:

      << : *dev-environment

      - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://${PUBLIC_HOSTNAME}:1${KF_PORT}

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://${PUBLIC_HOSTNAME}:1${KF_PORT}'

    ports:

      - target: ${KF_PORT}

        published: 1${KF_PORT}
@@ -32,7 +32,7 @@ services: 
  kf-2:

    environment:

      << : *dev-environment

      - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://${PUBLIC_HOSTNAME}:2${KF_PORT}

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://${PUBLIC_HOSTNAME}:2${KF_PORT}'

    ports:

      - target: ${KF_PORT}

        published: 2${KF_PORT}
@@ -42,7 +42,7 @@ services: 
  kf-3:

    environment:

      << : *dev-environment

      - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://${PUBLIC_HOSTNAME}:3${KF_PORT}

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://${PUBLIC_HOSTNAME}:3${KF_PORT}'

    ports:

      - target: ${KF_PORT}

        published: 3${KF_PORT}

kafka/docker-compose.prod.yml

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ version: '3.5' 


x-prod-environment:

  &prod-environment

  - KAFKA_HEAP_OPTS=-Xmx2g -Xms2g

  KAFKA_HEAP_OPTS: '-Xmx2g -Xms2g'



x-prod-deploy:

  &prod-deploy
@@ -25,7 +25,7 @@ services: 
  kf-1:

    environment:

      << : *prod-environment

      - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kf-1:${KF_PORT}

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kf-1:${KF_PORT}'

    deploy:

      << : *prod-deploy

      placement:
@@ -35,7 +35,7 @@ services: 
  kf-2:

    environment:

      << : *prod-environment

      - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kf-2:${KF_PORT}

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kf-2:${KF_PORT}'

    deploy:

      << : *prod-deploy

      placement:
@@ -45,7 +45,7 @@ services: 
  kf-3:

    environment:

      << : *prod-environment

      - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kf-3:${KF_PORT}

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kf-3:${KF_PORT}'

    deploy:

      << : *prod-deploy

      placement:

kafka/docker-compose.tmpl.yml

+20 −20
Original line number Diff line number Diff line
@@ -2,17 +2,17 @@ version: '3.5' 


x-tmpl-environment:

  &tmpl-environment

  - KAFKA_ZOOKEEPER_CONNECT=zk-1:${ZK_PORT},zk-2:${ZK_PORT},zk-3:${ZK_PORT}

  - KAFKA_LOG_DIRS

  - KAFKA_LOG_CLEANER_ENABLE

  - KAFKA_LOG_CLEANUP_POLICY

  - KAFKA_LOG_CLEANER_MIN_CLEANABLE_RATIO

  - KAFKA_LOG_CLEANER_MIN_COMPACTION_LAG_MS

  - KAFKA_LOG_ROLL_HOURS

  - KAFKA_NUM_PARTITIONS

  - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR

  - KAFKA_DEFAULT_REPLICATION_FACTOR

  - KAFKA_MIN_INSYNC_REPLICAS

  KAFKA_ZOOKEEPER_CONNECT: 'zk-1:${ZK_PORT},zk-2:${ZK_PORT},zk-3:${ZK_PORT}'

  KAFKA_LOG_DIRS: ${KAFKA_LOG_DIRS}

  KAFKA_LOG_CLEANER_ENABLE: ${KAFKA_LOG_CLEANER_ENABLE}

  KAFKA_LOG_CLEANUP_POLICY: ${KAFKA_LOG_CLEANUP_POLICY}

  KAFKA_LOG_CLEANER_MIN_CLEANABLE_RATIO: ${KAFKA_LOG_CLEANER_MIN_CLEANABLE_RATIO}

  KAFKA_LOG_CLEANER_MIN_COMPACTION_LAG_MS: ${KAFKA_LOG_CLEANER_MIN_COMPACTION_LAG_MS}

  KAFKA_LOG_ROLL_HOURS: ${KAFKA_LOG_ROLL_HOURS}

  KAFKA_NUM_PARTITIONS: ${KAFKA_NUM_PARTITIONS}

  KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: ${KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR}

  KAFKA_DEFAULT_REPLICATION_FACTOR: ${KAFKA_DEFAULT_REPLICATION_FACTOR}

  KAFKA_MIN_INSYNC_REPLICAS: ${KAFKA_MIN_INSYNC_REPLICAS}



x-tmpl-healthcheck:

  &tmpl-healthcheck
@@ -28,9 +28,9 @@ services: 
    hostname: kf-1

    environment:

      << : *tmpl-environment

      - KAFKA_BROKER_ID=1

      - KAFKA_LISTENERS=PLAINTEXT://kf-1:${KF_PORT}

      - KAFKA_JMX_PORT=9997

      KAFKA_BROKER_ID: 1

      KAFKA_LISTENERS: 'PLAINTEXT://kf-1:${KF_PORT}'

      KAFKA_JMX_PORT: 9997

    networks:

      - kafka-net

    volumes:
@@ -43,9 +43,9 @@ services: 
    hostname: kf-2

    environment:

      << : *tmpl-environment

      - KAFKA_BROKER_ID=2

      - KAFKA_LISTENERS=PLAINTEXT://kf-2:${KF_PORT}

      - KAFKA_JMX_PORT=9998

      KAFKA_BROKER_ID: 2

      KAFKA_LISTENERS: 'PLAINTEXT://kf-2:${KF_PORT}'

      KAFKA_JMX_PORT: 9998

    networks:

      - kafka-net

    volumes:
@@ -58,9 +58,9 @@ services: 
    hostname: kf-3

    environment:

      << : *tmpl-environment

      - KAFKA_BROKER_ID=3

      - KAFKA_LISTENERS=PLAINTEXT://kf-3:${KF_PORT}

      - KAFKA_JMX_PORT=9999

      KAFKA_BROKER_ID: 3

      KAFKA_LISTENERS: 'PLAINTEXT://kf-3:${KF_PORT}'

      KAFKA_JMX_PORT: 9999

    networks:

      - kafka-net

    volumes:

zookeeper/docker-compose.dev.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ version: '3.5' 


x-dev-environment:

  &dev-environment

  - ZOOKEEPER_HEAP_OPTS=-Xmx256m -Xms256m

  ZOOKEEPER_HEAP_OPTS: '-Xmx256m -Xms256m'



x-dev-deploy:

  &dev-deploy

zookeeper/docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ version: '3.5' 


x-prod-environment:

  &prod-environment

  - ZOOKEEPER_HEAP_OPTS=-Xmx512m -Xms512m

  ZOOKEEPER_HEAP_OPTS: '-Xmx512m -Xms512m'



x-prod-deploy:

  &prod-deploy