Commit 9477d514 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Elimina restos antiguos, actualiza detalles

See merge request redmic-project/gitlab-runner!5
parents 6bb2443c 2a774f50

.gitlab-ci.yml

+1 −11
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ include: 
stages:

  - deploy



variables:

  PROJECT_PARENT_NAME: gitlab



.lock-job: &lock-job

  rules:

    - if: $CI
@@ -16,8 +13,7 @@ variables: 


.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STACK: gitlab

    STATUS_CHECK_DELAY: 30



.deploy-development:
@@ -35,15 +31,10 @@ variables: 
deploy-stable-branch-production:

  <<: *lock-job



.deploy-registrar:

  variables: &deploy-registrar-variables

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}-registrar



.deploy-registrar-development:

  extends: .deploy-development

  variables:

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-registrar.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-registrar.dev.yml

    <<: *deploy-registrar-variables



.deploy-registrar-grafcan-gitlab-es-development:

  extends: .deploy-registrar-development
@@ -59,7 +50,6 @@ deploy-stable-branch-production: 
  extends: .deploy-production

  variables:

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-registrar.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-registrar.prod.yml

    <<: *deploy-registrar-variables



.deploy-registrar-grafcan-gitlab-es-production:

  extends: .deploy-registrar-production

README.md

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ gitlab-runner unregister --url http://gitlab.example.com/ --token t0k3n 


# Remove one runner, by runner name

gitlab-runner unregister --name test-runner





# Remove only broken runners

gitlab-runner verify --delete

deploy/.env

+4 −4
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ CACHE_S3_ACCESS_KEY=changeme 
CACHE_S3_SECRET_KEY=changeme

CACHE_S3_BUCKET_NAME=gitlab-runner-cache



CONFIG_VOL_NAME=gitlab-runner-config-vol

WORK_VOL_NAME=gitlab-runner-work-vol

VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

VOL_DEVICE=:/gitlab-runner-config-vol/

VOL_OPTS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

CONFIG_VOL_NAME=gitlab-runner-config-vol

CONFIG_VOL_DEVICE=:/gitlab-runner-config-vol/

WORK_VOL_NAME=gitlab-runner-work-vol



GITLAB_NET_NAME=gitlab-net

GITLAB_NET_DRIVER=overlay

deploy/docker-compose.gitlab-runner-registrar.dev.yml

+3 −3
Original line number Diff line number Diff line 
version: '3.8'

version: '3.9'



volumes:

  config-vol:

    name: ${CONFIG_VOL_NAME}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${VOL_DEVICE}
 
      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${CONFIG_VOL_DEVICE}

deploy/docker-compose.gitlab-runner-registrar.tmpl.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.8'

version: '3.9'



services:

  gitlab-runner-registrar: