Commit c6c6c586 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Adapta a imagen padre y corrige comando de copia

parent ccd17247

.gitlab-ci.yml

+7 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ image: docker:stable 


variables:

  DOCKER_DRIVER: overlay2

  KAFKA_CONNECT_ELASTICSEARCH_TAG: feature-redmicSupport-latest

  STACK: confluent

  SERVICES_TO_CHECK: confluent_${CI_PROJECT_NAME}

  IMAGE_NAME: ${CI_REGISTRY_IMAGE}
@@ -23,7 +24,9 @@ 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 KAFKA_CONNECT_ELASTICSEARCH_TAG=${KAFKA_CONNECT_ELASTICSEARCH_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:
@@ -32,7 +35,9 @@ docker-build-commit-master-branch: 
    - 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 KAFKA_CONNECT_ELASTICSEARCH_TAG=${KAFKA_CONNECT_ELASTICSEARCH_TAG}

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

    - docker push ${CI_REGISTRY_IMAGE}



docker-tag-already-built-image:

Dockerfile

+1 −3
Original line number Diff line number Diff line
@@ -6,6 +6,4 @@ FROM alpine:3.8 


LABEL maintainer="info@redmic.es"



ARG KAFKA_CONNECT_ELASTICSEARCH_TARGET=/build/target/redmic-kafka-connect-elasticsearch-5.0.1-package/share/java/kafka-connect-elasticsearch/



COPY --from=kce ${KAFKA_CONNECT_ELASTICSEARCH_TARGET} /jar
 
COPY --from=kce /jar/ /jar

deploy/docker-compose.tmpl.yml

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

  kafka-connector-loader:

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

    command: cp /jar/* /connect-jars

    command: cp -a /jar/. /connect-jars

    networks:

      - kafka-net

    volumes: