Commit 3c6e2666 authored by Ignacio's avatar Ignacio
Browse files

Cambia passive_ports a fichero .env

parent c587914c

.env

+1 −0
Original line number Diff line number Diff line 
PUBLIC_PORT=2224

PASSIVE_PUBLIC_PORT=30000-30009

.gitlab-ci.yml

+3 −6
Original line number Diff line number Diff line
@@ -17,13 +17,12 @@ deploy-dev: 
    SERVICES_TO_CHECK: etl_${CI_PROJECT_NAME}

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

    PUBLIC_PORT: ${DEV_PUBLIC_PORT}

    PASSIVE_PUBLIC_PORT: ${DEV_PASSIVE_PUBLIC_PORT}

    PUBLIC_HOST: ${DEV_PUBLIC_HOST}

  script:

    - create-nets.sh ingest-ftp-net

    - >

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

      PASSIVE_PUBLIC_PORT=${PASSIVE_PUBLIC_PORT} PUBLIC_HOST=${PUBLIC_HOST}

      PUBLIC_HOST=${PUBLIC_HOST}

  environment:

    name: dev

  only:
@@ -38,13 +37,12 @@ deploy-supporting-branch: 
    SERVICES_TO_CHECK: etl_${CI_PROJECT_NAME}

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

    PUBLIC_PORT: ${DEV_PUBLIC_PORT}

    PASSIVE_PUBLIC_PORT: ${DEV_PASSIVE_PUBLIC_PORT}

    PUBLIC_HOST: ${DEV_PUBLIC_HOST}

  script:

    - create-nets.sh ingest-ftp-net

    - >

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

      PASSIVE_PUBLIC_PORT=${PASSIVE_PUBLIC_PORT} PUBLIC_HOST=${PUBLIC_HOST}

      PUBLIC_HOST=${PUBLIC_HOST}

  environment:

    name: dev

  only:
@@ -62,13 +60,12 @@ deploy-pro: 
    SERVICES_TO_CHECK: etl_${CI_PROJECT_NAME}

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

    PUBLIC_PORT: ${PRO_PUBLIC_PORT}

    PASSIVE_PUBLIC_PORT: ${PRO_PASSIVE_PUBLIC_PORT}

    PUBLIC_HOST: ${PRO_PUBLIC_HOST}

  script:

    - create-nets.sh ingest-ftp-net

    - >

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

      PASSIVE_PUBLIC_PORT=${PASSIVE_PUBLIC_PORT} PUBLIC_HOST=${PUBLIC_HOST}

      PUBLIC_HOST=${PUBLIC_HOST}

  environment:

    name: pro

  only:

docker-compose.tmpl.yml

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



services:

  ingest-ftp:

  ingest-sftp:

    image: stilliard/pure-ftpd:hardened

    networks:

      - ingest-ftp-net
@@ -10,7 +10,7 @@ services: 
        published: ${PUBLIC_PORT}

        protocol: tcp

        mode: ingress

      - target: 30000

      - target: 30000-30009

        published: ${PASSIVE_PUBLIC_PORT}

        protocol: tcp

        mode: host