Commit 3a63683b authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/gateway/nginx-proxy-http!10
parents b827ecb0 941b980c

.gitlab-ci.yml

+1 −3
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy
@@ -9,5 +9,3 @@ stages: 
.deploy:

  variables:

    STACK: gateway
 
  environment:

    url: http://${PUBLIC_HOSTNAME}

deploy/.env

+6 −0
Original line number Diff line number Diff line 
HTTP_INTERNAL_PORT=80

HTTP_PORT=80

PORT_MODE=host



AWS_REGION=eu-west-1

ACME_VOL_NAME=acme-vol



REDIRECT_REDMIC_CONFIG_NAME=nginx-proxy-http-redirect-redmic-config

deploy/docker-compose.dev.yml→deploy/compose.dev.yaml

+20 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  nginx-proxy-http:

    deploy:
@@ -10,8 +8,13 @@ services: 
volumes:

  acme-vol:

    name: ${ACME_VOL_NAME}

    driver: local

    driver: ${VOL_DRIVER:-local}

    driver_opts:

      type: ${ACME_VOL_TYPE:-nfs4}

      o: addr=${ACME_VOL_ADDR:-127.0.0.1},${ACME_VOL_OPTIONS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      device: ${ACME_VOL_DEVICE:-:/acme-vol/}
 
      type: ${VOL_TYPE:-nfs}

      o: addr=${VOL_ADDR:-127.0.0.1},vers=${VOL_VERS:-4.2},${VOL_OPTS:-nolock,noacl,noatime,nodiratime}

      device: :${VOL_DEVICE_PREFIX}${ACME_VOL_DEVICE:-/acme-vol/}



configs:

  redirect-redmic-config:

    name: ${REDIRECT_REDMIC_CONFIG_NAME}

    file: ./config/dev-redirect-redmic.conf

deploy/docker-compose.prod.yml→deploy/compose.prod.yaml

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



services:

  nginx-proxy-http:

    deploy:
@@ -10,3 +8,8 @@ services: 
volumes:

  acme-vol:

    name: ${ACME_VOL_NAME}



configs:

  redirect-redmic-config:

    name: ${REDIRECT_REDMIC_CONFIG_NAME}

    file: ./config/pro-redirect-redmic.conf

deploy/docker-compose.tmpl.yml→deploy/compose.tmpl.yaml

+13 −11
Original line number Diff line number Diff line 
version: '3.5'



services:

  nginx-proxy-http:

    image: ${IMAGE_NAME:-nginx}:${IMAGE_TAG:-alpine}

    networks:

      traefik-net:

    ports:

      - target: 80

        published: 80

        mode: host

      - target: ${HTTP_INTERNAL_PORT}

        published: ${HTTP_PORT}

        mode: ${PORT_MODE}

    volumes:

      - acme-vol:/var/www/letsencrypt

    configs:

      - source: nginx-config

        target: /etc/nginx/nginx.conf

      - source: default-config

        target: /etc/nginx/conf.d/default.conf

    healthcheck:

      test: wget --spider -q http://localhost/nginx-health

      interval: ${HEALTHCHECK_INTERVAL:-30s}
@@ -27,7 +25,7 @@ services: 
        constraints:

          - node.role == manager

      restart_policy:

        delay: ${RESTART_DELAY:-5s}

        delay: ${RESTART_DELAY:-0s}

      update_config:

        delay: ${UPDATE_DELAY:-1m}

      resources:
@@ -45,6 +43,10 @@ networks: 
    external: true



configs:

  nginx-config:

    name: ${NGINX_CONFIG_NAME:-nginx-proxy-http-config}

    file: ./config/nginx.conf
 
  default-config:

    name: ${DEFAULT_CONFIG_NAME:-nginx-proxy-http-default-config}

    file: ./config/default.conf



  redirect-ecomarcan-config:

    name: ${REDIRECT_ECOMARCAN_CONFIG_NAME:-nginx-proxy-http-redirect-ecomarcan-config}

    file: ./config/redirect-ecomarcan.conf