Commit 19680b1c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Omite publicación de puerto en pro

See merge request redmic-project/service-deployment!3
parents 7c322bad bf0393c6

gitlab-ce/docker-compose.dev.yml

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ services: 
      - "${GITLAB_SSH_PORT}:22"

      - "${GITLAB_HTTP_PORT}:80"

      - "${GITLAB_HTTPS_PORT}:443"

    volumes:

      - /home/git/.ssh/authorized_keys_proxy:/gitlab-data/ssh/authorized_keys

    environment:

      GITLAB_OMNIBUS_CONFIG: |

        external_url '${GITLAB_PROTOCOL}://${GITLAB_SUBDOMAIN}.${GITLAB_DOMAIN}'

portainer/docker-compose.prod.yml

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ services: 
      mode: global

  portainer:

    command: -H tcp://tasks.agent:9001 --tlsskipverify

    ports:

      - 9000

    networks:

      - traefik-net

    deploy: