Commit 6b424cf4 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige paso de claves públicas a gitlab

parent f4b07569

.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/docker-compose.dev.yml

+5 −2
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ services: 
      - target: 443

        published: ${GITLAB_HTTPS_PORT}

        mode: host

    secrets:

      - source: authorized_keys_proxy

        target: /gitlab-data/ssh/authorized_keys

    deploy:

      mode: replicated

      replicas: 1
@@ -41,5 +44,5 @@ volumes: 
    name: gitlab-ce-data-vol



secrets:

  ssh-public-keys:

    file: /home/git/.ssh/authorized_keys_proxy
 
  authorized_keys_proxy:

    file: ./authorized_keys_proxy

gitlab-ce/docker-compose.tmpl.yml

+0 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ services: 
      - gitlab-ce-config-vol:/etc/gitlab

      - gitlab-ce-log-vol:/var/log/gitlab

      - gitlab-ce-data-vol:/var/opt/gitlab

    secrets:

      - source: ssh-public-keys

        target: /gitlab-data/ssh/authorized_keys



networks:

  gitlab-net: