Commit 4bfa2b2d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Permite recogida de datos anónimos

See merge request redmic-project/service-deployment!21
parents 2d4e7f93 194c5159

.gitlab-ci.yml

+22 −13
Original line number Diff line number Diff line
@@ -70,15 +70,20 @@ deploy-gitlab-runner-local: 
    SERVICES_TO_CHECK: gitlab_gitlab-runner-local

    IMAGE_TAG: alpine

    COMPOSE_FILE: docker-compose.gitlab-runner-local.tmpl.yml:docker-compose.gitlab-runner-local.dev.yml

    GITLAB_URL: https://git.redmic.net

    GITLAB_TOKEN: ${OAGDEV_GITLAB_TOKEN}

    RUNNER_NAME: OAGDev runner

    CI_SERVER_URL: http://gitlab_gitlab-ce

    REGISTRATION_TOKEN: ${OAGDEV_GITLAB_TOKEN}

    RUNNER_NAME: OAGDev local

    RUNNER_TAG_LIST: oagdev

    CACHE_S3_SERVER_ADDRESS: minio.redmic.net

    CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY}

    CACHE_S3_SECRET_KEY: ${MINIO_SECRET_KEY}

  script:

    - create-nets.sh gitlab-net

    - >

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

      GITLAB_TOKEN=${GITLAB_TOKEN} MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY} MINIO_SECRET_KEY=${MINIO_SECRET_KEY}

      RUNNER_NAME="${RUNNER_NAME}"

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} CI_SERVER_URL="${CI_SERVER_URL}"

      REGISTRATION_TOKEN="${REGISTRATION_TOKEN}" RUNNER_NAME="${RUNNER_NAME}" RUNNER_TAG_LIST="${RUNNER_TAG_LIST}"

      CACHE_S3_SERVER_ADDRESS="${CACHE_S3_SERVER_ADDRESS}" CACHE_S3_ACCESS_KEY="${MINIO_ACCESS_KEY}"

      CACHE_S3_SECRET_KEY="${MINIO_SECRET_KEY}"

  environment:

    name: dev/gitlab-runner-local

  only:
@@ -94,16 +99,20 @@ deploy-gitlab-runner-remote: 
    SERVICES_TO_CHECK: gitlab_gitlab-runner-remote

    IMAGE_TAG: alpine

    COMPOSE_FILE: docker-compose.gitlab-runner-remote.tmpl.yml:docker-compose.gitlab-runner-remote.dev.yml

    GITLAB_URL: https://gitlab.com

    GITLAB_TOKEN: ${GITLABCOM_GITLAB_TOKEN}

    RUNNER_NAME: GitLab.com runner

    RUNNER_TAG_LIST: client,functional,oagdev

    CI_SERVER_URL: https://gitlab.com

    REGISTRATION_TOKEN: ${GITLABCOM_GITLAB_TOKEN}

    RUNNER_NAME: OAGDev remote

    RUNNER_TAG_LIST: oagdev

    CACHE_S3_SERVER_ADDRESS: minio.redmic.net

    CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY}

    CACHE_S3_SECRET_KEY: ${MINIO_SECRET_KEY}

  script:

    - create-nets.sh gitlab-net

    - >

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

      GITLAB_TOKEN=${GITLAB_TOKEN} MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY} MINIO_SECRET_KEY=${MINIO_SECRET_KEY}

      RUNNER_NAME="${RUNNER_NAME}" RUNNER_TAG_LIST=${RUNNER_TAG_LIST}

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} CI_SERVER_URL="${CI_SERVER_URL}"

      REGISTRATION_TOKEN="${REGISTRATION_TOKEN}" RUNNER_NAME="${RUNNER_NAME}" RUNNER_TAG_LIST="${RUNNER_TAG_LIST}"

      CACHE_S3_SERVER_ADDRESS="${CACHE_S3_SERVER_ADDRESS}" CACHE_S3_ACCESS_KEY="${MINIO_ACCESS_KEY}"

      CACHE_S3_SECRET_KEY="${MINIO_SECRET_KEY}"

  environment:

    name: dev/gitlab-runner-remote

  only:

gitlab-ce/docker-compose.dev.yml

+2 −4
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ services: 
      - target: 22

        published: ${GITLAB_SSH_PORT}

        mode: host

      - target: 80

        published: ${GITLAB_HTTP_PORT}

        mode: host

    secrets:

      - source: authorized_keys_proxy

        target: /gitlab-data/ssh/authorized_keys
@@ -18,7 +15,8 @@ services: 
      labels:

        traefik.port: "80"

        traefik.docker.network: traefik-net

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

        traefik.gitlab.frontend.rule: Host:${GITLAB_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.registry.frontend.rule: Host:${GITLAB_REGISTRY_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.backend: gitlab

      restart_policy:

        delay: 2m

gitlab-runner/.env

+11 −9
Original line number Diff line number Diff line 
CONFIG_FILE=/etc/gitlab-runner/config.toml

REGISTER_NON_INTERACTIVE=true

REGISTER_LOCKED=false

REGISTER_RUN_UNTAGGED=true

RUNNER_LIMIT=2

RUNNER_REQUEST_CONCURRENCY=2

RUNNER_OUTPUT_LIMIT=40960

RUNNER_EXECUTOR=docker

RUNNER_DOCKER_IMAGE=alpine

RUNNER_DOCKER_TLS_VERIFY=false

RUNNER_DOCKER_PRIVILEGED=true

RUNNER_DOCKER_NETWORK_MODE=gitlab-net

RUNNER_DOCKER_DISABLE_CACHE=true

RUNNER_DOCKER_SHM_SIZE=1000000000

RUNNER_DOCKER_MEMORY=4g

RUNNER_DOCKER_MEMORY_SWAP=6g

RUNNER_DOCKER_MEMORY_RESERVATION=1g

RUNNER_DOCKER_CPUSET_CPUS=1,2

RUNNER_CACHE_TYPE=s3

RUNNER_CACHE_SHARED=true

MINIO_URL=minio.redmic.net

MINIO_ACCESS_KEY=accessKey

MINIO_SECRET_KEY=secretKey

RUNNER_S3_BUCKET_NAME=cache

RUNNER_S3_CACHE_INSECURE=false
 
RUNNER_DOCKER_CPUS=4

CACHE_TYPE=s3

CACHE_SHARED=true

CACHE_S3_BUCKET_NAME=cache

gitlab-runner/config-local/config.toml

deleted100755 → 0
+0 −2
Original line number Diff line number Diff line 
concurrent = 2

check_interval = 10

gitlab-runner/config-remote/config.toml

deleted100755 → 0
+0 −2
Original line number Diff line number Diff line 
concurrent = 2

check_interval = 10