Commit 0734df38 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Recupera imagen Docker propia, actualiza plugin 

Finalmente si hace falta instalar el plugin para Elasticsearch. Se
recupera la imagen para instalarlo y se aumenta versión de dicho plugin.
También se intenta limpiar mejor desde el Dockerfile, tras instalar el
plugin se eliminan las dependencias instaladas para ello.

Se adapta CI para crear la imagen usando plantillas.
parent 1852435b

.dockerignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
*

.gitlab-ci.yml

+8 −2
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/packaging.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'



stages:

  - package

  - test-package

  - deploy



variables:

  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}

  STACK: log

  IMAGE_NAME: fluent/fluentd

  IMAGE_TAG: v1.3



.deploy:

  script:

Dockerfile

0 → 100644
+19 −0
Original line number Diff line number Diff line 
ARG FLUENTD_VERSION=1.3



FROM fluent/fluentd:v${FLUENTD_VERSION}



LABEL maintainer="info@redmic.es"



ARG ES_PLUGIN_VERSION=3.5.0



RUN apk add --update --no-cache --virtual \

		.build-deps \

		build-base \

		ruby-dev && \

	gem install --no-document \

		fluent-plugin-elasticsearch:${ES_PLUGIN_VERSION} && \

	gem sources --clear-all && \

	apk del \

		.build-deps \

		build-base \

		ruby-dev

deploy/docker-compose.tmpl.yml

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


services:

  fluentd:

    image: ${IMAGE_NAME:-fluent/fluentd}:${IMAGE_TAG:-v1.3}

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      LOG_LEVEL:

      ES_HOSTS: