Commit 13bbe412 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Limpia y corrige postfixadmin como mailserver

See merge request redmic-project/service-deployment!17
parents 7f145ede 06b47def

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ services: 


variables:

  DOCKER_DRIVER: overlay2

  STATUS_CHECK_DELAY: 60



deploy-artifactory-dev:

  stage: deploy
@@ -35,6 +36,7 @@ deploy-gitlab-ce-dev: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: gitlab

    SERVICES_TO_CHECK: gitlab_gitlab-ce

    STATUS_CHECK_DELAY: 300

    IMAGE_TAG: latest

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

    AWS_REGION: ${OAGDEV_GITLAB_AWS_REGION}

artifactory/docker-compose.dev.yml

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ version: '3.5' 
services:

  artifactory:

    ports:

      - ${ARTIFACTORY_PORT}:8081

      - target: 8081

        published: ${ARTIFACTORY_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

gitlab-ce/docker-compose.dev.yml

+9 −3
Original line number Diff line number Diff line
@@ -27,9 +27,15 @@ services: 
        gitlab_rails['smtp_enable_starttls_auto'] = true

        unicorn['port'] = 8090

    ports:

      - "${GITLAB_SSH_PORT}:22"

      - "${GITLAB_HTTP_PORT}:80"

      - "${GITLAB_HTTPS_PORT}:443"

      - target: 22

        published: ${GITLAB_SSH_PORT}

        mode: host

      - 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

    deploy:

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

+7 −1
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ services: 
      - gitlab-net

    volumes:

      - /var/run/docker.sock:/var/run/docker.sock

      - ./config-local:/etc/gitlab-runner

    configs:

      - source: config-local

        target: /etc/gitlab-runner/config.toml

    environment:

      - CI_SERVER_URL=${GITLAB_URL}

      - REGISTRATION_TOKEN=${GITLAB_TOKEN}
@@ -43,3 +45,7 @@ services: 
networks:

  gitlab-net:

    external: true



configs:

  config-local:

    file: ./config-local/config.toml

gitlab-runner/docker-compose.gitlab-runner-remote.tmpl.yml

+7 −1
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ services: 
      - gitlab-net

    volumes:

      - /var/run/docker.sock:/var/run/docker.sock

      - ./config-remote:/etc/gitlab-runner

    configs:

      - source: config-remote

        target: /etc/gitlab-runner/config.toml

    environment:

      - CI_SERVER_URL=${GITLAB_URL}

      - REGISTRATION_TOKEN=${GITLAB_TOKEN}
@@ -43,3 +45,7 @@ services: 
networks:

  gitlab-net:

    external: true



configs:

  config-remote:

    file: ./config-remote/config.toml