Commit 964d7635 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza versión de plugin y adapta CI a template 

Aprovecha para usar args para pasar valores de construcción de la
imagen, como la versión del plugin search-guard (la antigua ya no estaba
disponible).
Adapta definición de jobs a nueva versión de plantillas.
parent a7f6db66

.gitlab-ci.yml

+6 −1
Original line number Diff line number Diff line
@@ -7,13 +7,18 @@ include: 
    file: '/_deployment.yml'



stages:

  - pre-package

  - package

  - test-package

  - post-package

  - deploy



variables:

  PROJECT_PARENT_NAME: elastic



.docker-build:

  variables:

    COMPOSE_FILE_NAME: docker-compose.es6-1.tmpl.yml:docker-compose.es6-1.dev.yml



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ ENV ES_PATH="${ES_PATH}" \ 
	network.host="0.0.0.0" \

	bootstrap.memory_lock="true"



ARG SEARCH_GUARD_VERSION="6.5.4-25.5"



RUN ulimit -n 65536 && \

	${ES_PATH}/bin/elasticsearch-plugin install --batch repository-s3 && \

	${ES_PATH}/bin/elasticsearch-plugin install --batch com.floragunn:search-guard-6:6.5.4-24.0

	${ES_PATH}/bin/elasticsearch-plugin install --batch com.floragunn:search-guard-6:${SEARCH_GUARD_VERSION}



VOLUME [ "${ES_PATH}/data" ]

deploy/.env

+4 −0
Original line number Diff line number Diff line 
PARENT_IMAGE_TAG=6.5.4

ES_PATH=/usr/share/elasticsearch

SEARCH_GUARD_VERSION=6.5.4-25.5



IMAGE_NAME=registry.gitlab.com/redmic-project/elastic/elasticsearch

IMAGE_TAG=latest

deploy/docker-compose.es6-1.tmpl.yml

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,13 @@ version: '3.5' 
services:

  es6-1:

    image: ${IMAGE_NAME}:${IMAGE_TAG}

    build:

      context: ..

      dockerfile: ${DOCKERFILE:-Dockerfile}

      args:

        PARENT_IMAGE_TAG:

        ES_PATH:

        SEARCH_GUARD_VERSION:

    environment:

      node.name: ${ES_NODE_NAME:-es6-1}

      node.master: ${ES_NODE_MASTER}