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

Actualiza formato y modo de mapeo de puertos 

La causa de la lentitud en el Swarm era el uso inapropiado del mapeo
de puertos de los contenedores al host, en modo "ingress". Lo correcto
para este uso es definirlos en modo "host", para no obligar a la red
de distribución de Docker Swarm a resolver las peticiones.
De paso, se actualiza la definición de puertos al nuevo formato
extendido, opción recomendada actualmente.
parent ac048cf3

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -36,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:

mail/mailserver/docker-compose.dev.yml

+18 −6
Original line number Diff line number Diff line
@@ -3,12 +3,24 @@ version: '3.5' 
services:

  mail-mailserver:

    ports:

      - "25:25"

      - "143:143"

      - "587:587"

      - "993:993"

      - "4190:4190"

      - "${RSPAMD_PORT}:${RSPAMD_PORT}"

      - target: 25

        published: 25

        mode: host

      - target: 143

        published: 143

        mode: host

      - target: 587

        published: 587

        mode: host

      - target: 993

        published: 993

        mode: host

      - target: 4190

        published: 4190

        mode: host

      - target: ${RSPAMD_PORT}

        published: ${RSPAMD_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

mail/postfixadmin/docker-compose.dev.yml

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

  mail-postfixadmin:

    ports:

      - "${POSTFIXADMIN_PORT}:8888"

      - target: 8888

        published: ${POSTFIXADMIN_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1