Commit 2d4e7f93 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Nombra volumen anónimo de Minio

See merge request redmic-project/service-deployment!20
parents c981335b d487791e

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ deploy-gitlab-ce-dev: 
    STACK: gitlab

    SERVICES_TO_CHECK: gitlab_gitlab-ce

    STATUS_CHECK_DELAY: 300

    AUTHORIZED_KEYS_PROXY: ${GITLAB_AUTHORIZED_KEYS_PROXY}

    IMAGE_TAG: latest

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

    AWS_REGION: ${OAGDEV_GITLAB_AWS_REGION}
@@ -47,6 +48,7 @@ deploy-gitlab-ce-dev: 
    SMTP_PASS: ${OAGDEV_GITLAB_SMTP_PASS}

    SMTP_DOMAIN: ${OAGDEV_GITLAB_SMTP_DOMAIN}

  script:

    - echo "${AUTHORIZED_KEYS_PROXY}" > "${DEPLOY_DIR_NAME}/authorized_keys_proxy"

    - create-nets.sh gitlab-net

    - >

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

gitlab-ce/.env

+0 −2
Original line number Diff line number Diff line 
GITLAB_PROTOCOL=http

GITLAB_DOMAIN=redmic.net

GITLAB_SUBDOMAIN=git

GITLAB_REGISTRY_SUBDOMAIN=registry

GITLAB_SSH_PORT=2022

GITLAB_HTTP_PORT=2080

GITLAB_HTTPS_PORT=2443

AWS_REGION=region

AWS_ACCESS_KEY_ID=id

AWS_SECRET_ACCESS_KEY=secret

gitlab-ce/docker-compose.dev.yml

+11 −31
Original line number Diff line number Diff line
@@ -2,30 +2,6 @@ version: '3.5' 


services:

  gitlab-ce:

    environment:

      GITLAB_OMNIBUS_CONFIG: |

        external_url '${GITLAB_PROTOCOL}://${GITLAB_SUBDOMAIN}.${GITLAB_DOMAIN}'

        registry_external_url 'https://${GITLAB_REGISTRY_SUBDOMAIN}.${GITLAB_DOMAIN}'

        gitlab_rails['registry_enabled'] = true

        web_server['external_users'] = ['www-data']

        gitlab_rails['backup_keep_time'] = 604800

        gitlab_rails['backup_upload_connection'] = {

           'provider' => 'AWS',

           'region' => "${AWS_REGION}",

           'aws_access_key_id' => "${AWS_ACCESS_KEY_ID}",

           'aws_secret_access_key' => "${AWS_SECRET_ACCESS_KEY}"

        }

        gitlab_rails['backup_upload_remote_directory'] = 'gitlab.bkp'

        gitlab_rails['db_port'] = 5432

        gitlab_rails['smtp_enable'] = true

        gitlab_rails['smtp_address'] = "${SMTP_ADDR}"

        gitlab_rails['smtp_port'] = 25

        gitlab_rails['smtp_user_name'] = "${SMTP_USER}"

        gitlab_rails['smtp_password'] = "${SMTP_PASS}"

        gitlab_rails['smtp_domain'] = "${SMTP_DOMAIN}"

        gitlab_rails['smtp_authentication'] = "plain"

        gitlab_rails['smtp_enable_starttls_auto'] = true

        unicorn['port'] = 8090

    ports:

      - target: 22

        published: ${GITLAB_SSH_PORT}
@@ -33,18 +9,16 @@ services: 
      - target: 80

        published: ${GITLAB_HTTP_PORT}

        mode: host

      - target: 443

        published: ${GITLAB_HTTPS_PORT}

        mode: host

    volumes:

      - /home/git/.ssh/authorized_keys_proxy:/gitlab-data/ssh/authorized_keys

    secrets:

      - source: authorized_keys_proxy

        target: /gitlab-data/ssh/authorized_keys

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "443"

        traefik.port: "80"

        traefik.docker.network: traefik-net

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

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

        traefik.backend: gitlab

      restart_policy:

        delay: 2m
@@ -59,7 +33,13 @@ services: 
volumes:

  gitlab-ce-config-vol:

    name: gitlab-ce-config-vol



  gitlab-ce-log-vol:

    name: gitlab-ce-log-vol



  gitlab-ce-data-vol:

    name: gitlab-ce-data-vol



secrets:

  authorized_keys_proxy:

    file: ./authorized_keys_proxy

gitlab-ce/docker-compose.tmpl.yml

+23 −0
Original line number Diff line number Diff line
@@ -4,6 +4,28 @@ services: 
  gitlab-ce:

    image: gitlab/gitlab-ce:${IMAGE_TAG:-latest}

    hostname: ${GITLAB_SUBDOMAIN}.${GITLAB_DOMAIN}

    environment:

      GITLAB_OMNIBUS_CONFIG: |

        external_url 'http://${GITLAB_SUBDOMAIN}.${GITLAB_DOMAIN}'

        registry_external_url 'http://${GITLAB_REGISTRY_SUBDOMAIN}.${GITLAB_DOMAIN}'

        gitlab_rails['registry_enabled'] = true

        gitlab_rails['backup_keep_time'] = 604800

        gitlab_rails['backup_upload_connection'] = {

           'provider' => 'AWS',

           'region' => "${AWS_REGION}",

           'aws_access_key_id' => "${AWS_ACCESS_KEY_ID}",

           'aws_secret_access_key' => "${AWS_SECRET_ACCESS_KEY}"

        }

        gitlab_rails['backup_upload_remote_directory'] = 'gitlab.bkp'

        gitlab_rails['smtp_enable'] = true

        gitlab_rails['smtp_address'] = "${SMTP_ADDR}"

        gitlab_rails['smtp_port'] = 25

        gitlab_rails['smtp_user_name'] = "${SMTP_USER}"

        gitlab_rails['smtp_password'] = "${SMTP_PASS}"

        gitlab_rails['smtp_domain'] = "${SMTP_DOMAIN}"

        gitlab_rails['smtp_authentication'] = "plain"

        gitlab_rails['smtp_enable_starttls_auto'] = true

        gitlab_rails['smtp_tls'] = false

    networks:

      - gitlab-net

      - traefik-net
@@ -15,5 +37,6 @@ services: 
networks:

  gitlab-net:

    external: true



  traefik-net:

    external: true

gitlab-runner/docker-compose.gitlab-runner-local.dev.yml

+7 −0
Original line number Diff line number Diff line
@@ -14,3 +14,10 @@ services: 
          memory: 1G

        reservations:

          memory: 820M



volumes:

  etc-vol:

    name: gitlab-runner-local-etc-vol



  home-vol:

    name: gitlab-runner-local-home-vol