Commit b2b1bae3 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Hace coincidir nombre de servicios y contenedores 

Para poder comprobar correctamente si el despliegue tuvo éxito, han de
coincidir los nombres de servicio y de contenedor del mismo.
De paso, también simplifica los nombres de los ficheros compose.
parent 977742ae

.gitlab-ci.yml

+11 −13
Original line number Diff line number Diff line
@@ -69,20 +69,18 @@ deploy-mail-server-dev: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

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

  services:

    - docker:dind

  script:

    - create-nets.sh mail-net

    - export DEPLOY_DIR_NAME=mail/mariadb SERVICE=mariadb IMAGE_TAG=10.2

    - export COMPOSE_FILE=docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.dev.yml

    - export DEPLOY_DIR_NAME=mail/mariadb SERVICE=mail-mariadb IMAGE_TAG=10.2

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}

      MYSQL_PASSWORD=${DB_PASSWORD}

    - export DEPLOY_DIR_NAME=mail/redis SERVICE=redis IMAGE_TAG=4.0-alpine

    - export COMPOSE_FILE=docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.dev.yml

    - export DEPLOY_DIR_NAME=mail/redis SERVICE=mail-redis IMAGE_TAG=4.0-alpine

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

    - export DEPLOY_DIR_NAME=mail/mailserver SERVICE=mailserver IMAGE_TAG=1.1-latest

    - export COMPOSE_FILE=docker-compose.${SERVICE}.tmpl.yml:docker-compose.${SERVICE}.dev.yml

    - export DEPLOY_DIR_NAME=mail/mailserver SERVICE=mail-mailserver IMAGE_TAG=1.1-latest

    - >

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

      DBPASS=${DB_PASSWORD}
@@ -99,16 +97,16 @@ deploy-mail-admin-dev: 
    DOCKER_DRIVER: overlay2

    DEPLOY_DIR_NAME: mail/postfixadmin

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: postfixadmin

    SERVICE: mail-postfixadmin

    IMAGE_TAG: latest

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

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

  services:

    - docker:dind

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} DBPASS=${DB_PASSWORD}

  environment:

    name: dev/${SERVICE}

    url: https://${SERVICE}.${DEV_PUBLIC_HOSTNAME}

    name: dev/postfixadmin

    url: https://postfixadmin.${DEV_PUBLIC_HOSTNAME}

  only:

    - dev

  when: manual
@@ -119,15 +117,15 @@ deploy-mail-client-dev: 
    DOCKER_DRIVER: overlay2

    DEPLOY_DIR_NAME: mail/rainloop

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: rainloop

    SERVICE: mail-rainloop

    IMAGE_TAG: latest

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

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

  services:

    - docker:dind

  script:

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

  environment:

    name: dev/${SERVICE}

    name: dev/rainloop

    url: https://webmail.${DEV_PUBLIC_HOSTNAME}

  only:

    - dev

mail/mailserver/docker-compose.mailserver.dev.yml→mail/mailserver/docker-compose.dev.yml

+4 −4
Original line number Diff line number Diff line 
version: '3.5'



services:

  mailserver:

    container_name: email-server

  mail-mailserver:

    container_name: mail-mailserver

    restart: on-failure:3

    ports:

      - 25:25 # SMTP - Required
@@ -16,5 +16,5 @@ services: 
      - ${RSPAMD_PORT}:${RSPAMD_PORT}



volumes:

  mailserver-vol:

    name: mailserver-vol
 
  mail-mailserver-vol:

    name: mail-mailserver-vol

mail/mailserver/docker-compose.mailserver.tmpl.yml→mail/mailserver/docker-compose.tmpl.yml

+2 −2
Original line number Diff line number Diff line 
version: '3.5'



services:

  mailserver:

  mail-mailserver:

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

    domainname: redmic.es # Mail server A/MX/FQDN & reverse PTR = mail.domain.tld.

    hostname: mail

    networks:

      - mail-net

    volumes:

      - mailserver-vol:/var/mail

      - mail-mailserver-vol:/var/mail

      - /etc/letsencrypt:/etc/letsencrypt

    environment:

      - DBPASS # MariaDB database password (required)

mail/mariadb/docker-compose.mariadb.dev.yml→mail/mariadb/docker-compose.dev.yml

+10 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  mariadb:

    container_name: email-mariadb

  mail-mariadb:

    container_name: mail-mariadb

    restart: on-failure:3



volumes:

  mariadb-vol:

    name: mariadb-vol
 
  mail-mariadb-vol:

    name: mail-mariadb-vol

mail/mariadb/docker-compose.mariadb.tmpl.yml→mail/mariadb/docker-compose.tmpl.yml

+2 −2
Original line number Diff line number Diff line 
version: '3.5'



services:

  mariadb:

  mail-mariadb:

    image: mariadb:${IMAGE_TAG:-latest}

    networks:

      - mail-net

    volumes:

      - mariadb-vol:/var/lib/mysql

      - mail-mariadb-vol:/var/lib/mysql

    environment:

      - MYSQL_ROOT_PASSWORD

      - MYSQL_DATABASE=postfix