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

Merge branch 'dev' into 'master' 

Omite rutas de entornos

See merge request redmic-project/gis/sftp!6
parents 36e499e4 45708f6d

.gitlab-ci.yml

+0 −4
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ deploy-dev: 
    SERVICE: ${CI_PROJECT_NAME}

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

    SFTP_USERS: ${DEV_SFTP_USERS}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    PUBLIC_PORT: ${DEV_PUBLIC_PORT}

  services:

    - docker:dind
@@ -22,7 +21,6 @@ deploy-dev: 
      PUBLIC_PORT=${PUBLIC_PORT}

  environment:

    name: dev

    url: sftp://${PUBLIC_HOSTNAME}:${PUBLIC_PORT}

  only:

    - branches

  except:
@@ -39,7 +37,6 @@ deploy-pro: 
    SERVICES_TO_CHECK: gis_${CI_PROJECT_NAME}

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

    SFTP_USERS: ${PRO_SFTP_USERS}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    PUBLIC_PORT: ${PRO_PUBLIC_PORT}

  services:

    - docker:dind
@@ -49,7 +46,6 @@ deploy-pro: 
      PUBLIC_PORT=${PUBLIC_PORT}

  environment:

    name: pro

    url: sftp://${PUBLIC_HOSTNAME}:${PUBLIC_PORT}

  only:

    - master

  when: manual
 
 No newline at end of file