Commit 3db2581d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza detalles de CI

See merge request redmic-project/confluent/kafka-connector-loader!4
parents 97e12731 168cbbe1

.gitlab-ci.yml

+7 −11
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ stages: 


image: docker:stable



services:

  - docker:dind



variables:

  DOCKER_DRIVER: overlay2

  KAFKA_CONNECT_ELASTICSEARCH_TAG: feature-redmicSupport-latest
@@ -14,9 +17,6 @@ variables: 
  IMAGE_NAME: ${CI_REGISTRY_IMAGE}

  IMAGE_TAG: ${CI_COMMIT_SHA}



services:

  - docker:dind



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

  stage: package

  only:
@@ -74,11 +74,10 @@ container-scanning: 


deploy-supporting-branch-develop:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    CONNECT_SERVICE_NAME: ${DEV_CONNECT_SERVICE_NAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
@@ -93,11 +92,10 @@ deploy-supporting-branch-develop: 


deploy-stable-branch-develop:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    CONNECT_SERVICE_NAME: ${DEV_CONNECT_SERVICE_NAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
@@ -110,11 +108,10 @@ deploy-stable-branch-develop: 


deploy-supporting-branch-production:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    CONNECT_SERVICE_NAME: ${PRO_CONNECT_SERVICE_NAME}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
@@ -129,11 +126,10 @@ deploy-supporting-branch-production: 


deploy-stable-branch-production:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    CONNECT_SERVICE_NAME: ${PRO_CONNECT_SERVICE_NAME}

  script:

    - >

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

deploy/docker-compose.dev.yml

+4 −0
Original line number Diff line number Diff line 
version: '3.5'



volumes:

  connect-jars-vol:

    name: ${CONNECT_JARS_VOL_NAME:-connect-jars-vol}

deploy/docker-compose.prod.yml

+6 −6
Original line number Diff line number Diff line 
version: '3.5'



services:

  kafka-connector-loader:

    deploy:

      placement:

        constraints:

          - node.role == worker
 
volumes:

  connect-jars-vol:

    name: ${CONNECT_JARS_VOL_NAME:-connect-jars-vol}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: shared

deploy/docker-compose.tmpl.yml

+3 −4
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ services: 
      replicas: 1

      restart_policy:

        condition: none

      placement:

        constraints:

          - node.role == manager

      resources:

        limits:

          cpus: '0.1'
@@ -26,7 +29,3 @@ networks: 
  kafka-net:

    name: ${KAFKA_NET_NAME:-kafka-net}

    external: true
 


volumes:

  connect-jars-vol:

    name: ${CONNECT_JARS_VOL_NAME:-connect-jars-vol}