Commit 36e499e4 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige detalles de CI y reinicio en pro

See merge request redmic-project/gis/sftp!5
parents 6affc395 c9f819d6

.env

+1 −1
Original line number Diff line number Diff line 
PORT=2222
 
PUBLIC_PORT=2222

.gitlab-ci.yml

+13 −4
Original line number Diff line number Diff line
@@ -12,35 +12,44 @@ 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

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS}

      PUBLIC_PORT=${PUBLIC_PORT}

  environment:

    name: dev

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

  only:

    - branches

  except:

    - master

  when: manual





deploy-pro:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: gis

    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

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS}

      PUBLIC_HOSTNAME=${PRO_PUBLIC_HOSTNAME}

      PUBLIC_PORT=${PUBLIC_PORT}

  environment:

    name: master

    name: pro

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

  only:

    - master

  when: manual
 
 No newline at end of file

docker-compose.prod.yml

+3 −2
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ services: 
          - node.role == manager

      restart_policy:

        condition: on-failure

        max_attempts: 3

        delay: 1m

        window: 3m



volumes:

  geoserver-vol:

docker-compose.tmpl.yml

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ services: 
  sftp:

    image: atmoz/sftp:alpine

    ports:

      - "${PORT}:22"

      - "${PUBLIC_PORT}:22"

    volumes:

        - geoserver-vol:/home/geoserver/geoserver

    command: "${SFTP_USERS}"