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

Merge branch 'dev' into 'master' 

introduce volumen nfs

See merge request redmic-project/gateway/nginx-proxy-http!9
parents be20dbf3 f5bf5e4f

.gitlab-ci.yml

+1 −5
Original line number Diff line number Diff line
@@ -6,12 +6,8 @@ include: 
stages:

  - deploy



variables:

  PROJECT_PARENT_NAME: gateway



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STACK: gateway

  environment:

    url: http://${PUBLIC_HOSTNAME}

deploy/.env

+1 −0
Original line number Diff line number Diff line 
AWS_REGION=eu-west-1

ACME_VOL_NAME=acme-vol

deploy/config/nginx.conf

+1 −6
Original line number Diff line number Diff line
@@ -13,12 +13,7 @@ http { 
	include /etc/nginx/mime.types;

	default_type application/octet-stream;



	log_format main

		'$remote_addr - $remote_user [$time_local] "$request" '

		'$status $body_bytes_sent "$http_referer" '

		'"$http_user_agent" "$http_x_forwarded_for"';



	access_log /var/log/nginx/access.log main;

	access_log off;



	server {

		listen [::]:80 ipv6only=on;

deploy/docker-compose.dev.yml

+9 −1
Original line number Diff line number Diff line
@@ -5,5 +5,13 @@ services: 
    deploy:

      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}

          - node.labels.${PLACEMENT_CONSTRAINTS_NODE_LABELS_NAME:-gateway} == ${PLACEMENT_CONSTRAINTS_NODE_LABELS_VALUE:-true}



volumes:

  acme-vol:

    name: ${ACME_VOL_NAME}

    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/}

deploy/docker-compose.prod.yml

+4 −0
Original line number Diff line number Diff line
@@ -6,3 +6,7 @@ services: 
      placement:

        constraints:

          - engine.labels.availability_zone == ${AWS_REGION}a



volumes:

  acme-vol:

    name: ${ACME_VOL_NAME}