Commit 84812af1 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Instala plugins desde Dockerfile multicapa

parent b49024ca

.gitlab-ci.yml

+12 −21
Original line number Diff line number Diff line 
stages:

  - build

  - package

  - test-package

  - deploy
@@ -8,7 +7,8 @@ image: docker:stable 


variables:

  DOCKER_DRIVER: overlay2

  KIBANA_VERSION: '6.5.4'

  NODE_IMAGE_TAG: '11-alpine'

  KIBANA_IMAGE_TAG: '6.5.4'

  STACK: elastic

  SERVICES_TO_CHECK: elastic_${CI_PROJECT_NAME}

  IMAGE_NAME: ${CI_REGISTRY_IMAGE}
@@ -17,25 +17,10 @@ variables: 
services:

  - docker:dind



prepare-modules:

  stage: build

  image: npm:slim

  variables:

    GIT_SUBMODULE_STRATEGY: normal

  script:

    - cd modules/kibana-datepicker-plugin

    - npm version --no-git-tag-version ${KIBANA_VERSION}

    - cd -

  only:

    - branches

  artifacts:

    name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}

    expire_in: 1 day

    paths:

      - modules/



docker-build-commit-non-master-branches:

  stage: package

  variables:

    GIT_SUBMODULE_STRATEGY: normal

  tags:

    - oagdev

  only:
@@ -44,18 +29,24 @@ docker-build-commit-non-master-branches: 
    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - >

      docker build --build-arg NODE_IMAGE_TAG=${NODE_IMAGE_TAG} --build-arg KIBANA_IMAGE_TAG=${KIBANA_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-commit-master-branch:

  stage: package

  variables:

    GIT_SUBMODULE_STRATEGY: normal

  tags:

    - oagdev

  only:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - >

      docker build --build-arg NODE_IMAGE_TAG=${NODE_IMAGE_TAG} --build-arg KIBANA_IMAGE_TAG=${KIBANA_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-tag-already-built-image:

Dockerfile

+12 −3
Original line number Diff line number Diff line 
ARG PARENT_IMAGE_TAG="6.5.4"

ARG NODE_IMAGE_TAG="11-alpine"

ARG KIBANA_IMAGE_TAG="6.5.4"



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

FROM node:${NODE_IMAGE_TAG} AS npm-build



COPY modules/ /modules/



WORKDIR /modules/kibana-datepicker-plugin



RUN npm version --no-git-tag-version ${KIBANA_IMAGE_TAG}



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



LABEL maintainer="info@redmic.es"
@@ -12,4 +21,4 @@ ARG LOGTRAIL_URL="https://github.com/sivasamyk/logtrail/releases/download/v0.1.3 


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



COPY modules/ plugins/
 
COPY --from=npm-build /modules/ plugins/