Commit bc7bc684 authored Jun 25, 2020 by Pedro Eduardo Trujillo

Actualiza versiones y parametriza dependencias

Sube fluentd desde 1.3 hasta 1.11.
Sube fluent-plugin-elasticsearch desde 3.5.0 hasta 4.0.9.
Incluye nuevos args para dependencias, con mismo valor de versión.
Adapta Dockerfile para cambiar de usuario al instalar deps (y vuelve al
anterior tras ello).
Añade update delay, rebaja restart delay.

parent 380cde29

Dockerfile

+10 −4

Original line number	Diff line number	Diff line
		ARG FLUENTD_VERSION=1.3
		ARG FLUENTD_VERSION=1.11

		FROM fluent/fluentd:v${FLUENTD_VERSION}

		LABEL maintainer="info@redmic.es"

		ARG ES_PLUGIN_VERSION=3.5.0
		ARG ES_PLUGIN_VERSION=4.0.9
		ARG BUILD_BASE_VERSION=0.5-r1
		ARG RUBY_DEV_VERSION=2.5.8-r0

		USER root

		RUN apk add --update --no-cache \
		--virtual .build-deps \
		build-base=0.5-r1 \
		ruby-dev=2.5.8-r0 && \
		build-base=${BUILD_BASE_VERSION} \
		ruby-dev=${RUBY_DEV_VERSION} && \
		gem install --no-document \
		fluent-plugin-elasticsearch:${ES_PLUGIN_VERSION} && \
		gem sources --clear-all && \
		apk del .build-deps

		USER fluent

deploy/.env

+4 −2

Original line number	Diff line number	Diff line
		@@ -2,5 +2,7 @@ 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
		FLUENTD_VERSION=1.11
		ES_PLUGIN_VERSION=4.0.9
		BUILD_BASE_VERSION=0.5-r1
		RUBY_DEV_VERSION=2.5.8-r0

deploy/docker-compose.tmpl.yml

+5 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@ services:
		args:
		FLUENTD_VERSION:
		ES_PLUGIN_VERSION:
		BUILD_BASE_VERSION:
		RUBY_DEV_VERSION:
		environment:
		LOG_LEVEL:
		ES_HOSTS:
		@@ -26,7 +28,9 @@ services:
		mode: replicated
		replicas: ${REPLICAS:-1}
		restart_policy:
		delay: ${RESTART_DELAY:-10s}
		delay: ${RESTART_DELAY:-5s}
		update_config:
		delay: ${UPDATE_DELAY:-1m}
		resources:
		limits:
		cpus: '${RESOURCES_LIMITS_CPUS:-1}'