Commit 11a17bfe authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza a última versión patch, omite auth

parent 15df1c45

.gitlab-ci.yml

+4 −8
Original line number Diff line number Diff line
@@ -80,12 +80,11 @@ deploy-supporting-branch-develop: 
    ELASTICSEARCH_USERNAME: ${DEV_ELASTICSEARCH_USERNAME}

    ELASTICSEARCH_PASSWORD: ${DEV_ELASTICSEARCH_PASSWORD}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_USERNAME=${ELASTICSEARCH_USERNAME}

      ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}

      ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://kibana.${DEV_PUBLIC_HOSTNAME}
@@ -105,12 +104,11 @@ deploy-stable-branch-develop: 
    ELASTICSEARCH_USERNAME: ${DEV_ELASTICSEARCH_USERNAME}

    ELASTICSEARCH_PASSWORD: ${DEV_ELASTICSEARCH_PASSWORD}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_USERNAME=${ELASTICSEARCH_USERNAME}

      ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}

      ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://kibana.${DEV_PUBLIC_HOSTNAME}
@@ -128,12 +126,11 @@ deploy-supporting-branch-production: 
    ELASTICSEARCH_USERNAME: ${PRO_ELASTICSEARCH_USERNAME}

    ELASTICSEARCH_PASSWORD: ${PRO_ELASTICSEARCH_PASSWORD}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${PRO_UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_USERNAME=${ELASTICSEARCH_USERNAME}

      ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}

      ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://kibana.${PRO_PUBLIC_HOSTNAME}
@@ -153,12 +150,11 @@ deploy-stable-branch-production: 
    ELASTICSEARCH_USERNAME: ${PRO_ELASTICSEARCH_USERNAME}

    ELASTICSEARCH_PASSWORD: ${PRO_ELASTICSEARCH_PASSWORD}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${PRO_UI_AUTH}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      ELASTICSEARCH_URL=${ELASTICSEARCH_URL} ELASTICSEARCH_USERNAME=${ELASTICSEARCH_USERNAME}

      ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}

      ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://kibana.${PRO_PUBLIC_HOSTNAME}

Dockerfile

+3 −3
Original line number Diff line number Diff line 
ARG PARENT_IMAGE_TAG="6.5.1"

ARG PARENT_IMAGE_TAG="6.5.4"



FROM docker.elastic.co/kibana/kibana:${PARENT_IMAGE_TAG}



LABEL maintainer="info@redmic.es"



ARG SEARCH_GUARD_URL="https://search.maven.org/remotecontent?filepath=com/floragunn/search-guard-kibana-plugin/6.5.1-17/search-guard-kibana-plugin-6.5.1-17.zip"

ARG SEARCH_GUARD_URL="https://search.maven.org/remotecontent?filepath=com/floragunn/search-guard-kibana-plugin/6.5.4-17/search-guard-kibana-plugin-6.5.4-17.zip"



RUN ./bin/kibana-plugin install --no-optimize ${SEARCH_GUARD_URL}



ARG LOGTRAIL_URL="https://github.com/sivasamyk/logtrail/releases/download/v0.1.30/logtrail-6.5.1-0.1.30.zip"

ARG LOGTRAIL_URL="https://github.com/sivasamyk/logtrail/releases/download/v0.1.30/logtrail-6.5.4-0.1.30.zip"



RUN ./bin/kibana-plugin install --no-optimize ${LOGTRAIL_URL}

deploy/docker-compose.tmpl.yml

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.frontend.auth.basic.users: ${UI_AUTH}

        traefik.frontend.rule: Host:kibana.${PUBLIC_HOSTNAME}

        traefik.backend: kibana

        traefik.port: "${PORT}"