Commit 713b54b8 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Cambia vols. por configs y corrige mailserver

parent 2d98afb6

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ services: 


variables:

  DOCKER_DRIVER: overlay2

  STATUS_CHECK_DELAY: 120

  STATUS_CHECK_DELAY: 60



deploy-artifactory-dev:

  stage: 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

mail/mailserver/.env

+1 −1
Original line number Diff line number Diff line 
DOMAIN_NAME=redmic.es

DOMAIN=redmic.es

HOST_NAME=mail

ADD_DOMAINS=redmic.net

REDIS_HOST=mail-redis

mail/mailserver/docker-compose.tmpl.yml

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

  mail-mailserver:

    image: hardware/mailserver:${IMAGE_TAG:-latest}

    domainname: ${DOMAIN_NAME}

    hostname: ${HOST_NAME}

    networks:

      - mail-net
@@ -11,7 +10,7 @@ services: 
    volumes:

      - mail-mailserver-vol:/var/mail

    environment:

      - DOMAIN=${DOMAIN_NAME}

      - DOMAIN

      - REDIS_HOST

      - DBHOST

      - DBPASS