Commit 544020fc authored by Noel Alonso's avatar Noel Alonso
Browse files

Traslada docker build a docker-compose.yml

parent 17d48aea

.gitlab-ci.yml

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ stages: 


variables:

  PROJECT_PARENT_NAME: log

  FLUENTD_VERSION: '1.3'

  ES_PLUGIN_VERSION: '3.5.0'

  DOCKER_BUILD_ARGS: --build-arg FLUENTD_VERSION=${FLUENTD_VERSION} --build-arg ES_PLUGIN_VERSION=${ES_PLUGIN_VERSION}



.deploy:

  variables:

deploy/.env

+2 −0
Original line number Diff line number Diff line
@@ -2,3 +2,5 @@ LOG_LEVEL=warn 
ES_HOSTS=es-1:9200,es-2:9200,es-3:9200

ES_USER=user

ES_PASS=pass

FLUENTD_VERSION=1.3

ES_PLUGIN_VERSION=3.5.0

deploy/docker-compose.tmpl.yml

+8 −2
Original line number Diff line number Diff line
@@ -3,14 +3,20 @@ version: '3.5' 
services:

  fluentd:

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/log/fluentd}:${IMAGE_TAG:-latest}

    build:

      context: ..

      dockerfile: ${DOCKERFILE:-Dockerfile}

      args:

        FLUENTD_VERSION:

        ES_PLUGIN_VERSION:

    environment:

      LOG_LEVEL:

      ES_HOSTS:

      ES_USER:

      ES_PASS:

    networks:

      - log-net

      - elastic-net

      log-net:

      elastic-net:

    configs:

      - source: fluent-conf

        target: /fluentd/etc/fluent.conf