From 59c88bc7e51f3136a367887da06b75f90df9007d Mon Sep 17 00:00:00 2001 From: Radoslav Dimitrov Date: Wed, 30 Jan 2019 11:17:55 +0200 Subject: [PATCH] Reconcile Docker Compose files for each architecture Signed-off-by: Radoslav Dimitrov --- docker-compose.arm64.yml | 24 +++++++++++++----------- docker-compose.armhf.yml | 40 +++++++++++++++++++++++----------------- docker-compose.yml | 4 ++-- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/docker-compose.arm64.yml b/docker-compose.arm64.yml index dfdc71bc..13659fd7 100644 --- a/docker-compose.arm64.yml +++ b/docker-compose.arm64.yml @@ -8,21 +8,23 @@ services: - functions environment: functions_provider_url: "http://faas-swarm:8080/" - read_timeout: "300s" # Maximum time to read HTTP request - write_timeout: "300s" # Maximum time to write HTTP response - upstream_timeout: "300s" # Maximum duration of upstream function call - should be more than read_timeout and write_timeout - dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD + read_timeout: "5m5s" # Maximum time to read HTTP request + write_timeout: "5m5s" # Maximum time to write HTTP response + upstream_timeout: "5m" # Maximum duration of upstream function call - should be more than read_timeout and write_timeout + dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD faas_nats_address: "nats" faas_nats_port: 4222 - direct_functions: "true" # Functions are invoked directly over the overlay network + direct_functions: "true" # Functions are invoked directly over the overlay network direct_functions_suffix: "" basic_auth: "${BASIC_AUTH:-true}" secret_mount_path: "/run/secrets/" - scale_from_zero: "true" + scale_from_zero: "true" # Enable if you want functions to scale from 0/0 to min replica count upon invoke + max_idle_conns: 1024 + max_idle_conns_per_host: 1024 deploy: resources: # limits: # Enable if you want to limit memory usage - # memory: 100M + # memory: 200M reservations: memory: 100M restart_policy: @@ -39,14 +41,14 @@ services: # Docker Swarm provider faas-swarm: - image: openfaas/faas-swarm:0.6.1-arm64 volumes: - "/var/run/docker.sock:/var/run/docker.sock" + image: openfaas/faas-swarm:0.6.1-arm64 networks: - functions environment: - read_timeout: "300s" # set both here, and on your functions - write_timeout: "300s" # set both here, and on your functions + read_timeout: "5m5s" # set both here, and on your functions + write_timeout: "5m5s" # set both here, and on your functions DOCKER_API_VERSION: "1.30" basic_auth: "${BASIC_AUTH:-true}" secret_mount_path: "/run/secrets/" @@ -95,7 +97,7 @@ services: - functions environment: max_inflight: "1" - ack_wait: "300s" # Max duration of any async task / request + ack_wait: "5m5s" # Max duration of any async task / request basic_auth: "${BASIC_AUTH:-true}" secret_mount_path: "/run/secrets/" deploy: diff --git a/docker-compose.armhf.yml b/docker-compose.armhf.yml index 4415424c..1177d440 100644 --- a/docker-compose.armhf.yml +++ b/docker-compose.armhf.yml @@ -8,20 +8,23 @@ services: - functions environment: functions_provider_url: "http://faas-swarm:8080/" - read_timeout: "305s" # Maximum time to read HTTP request - write_timeout: "305s" # Maximum time to write HTTP response - upstream_timeout: "300s" # Maximum duration of upstream function call - should be more than read_timeout and write_timeout dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD + read_timeout: "5m5s" # Maximum time to read HTTP request + write_timeout: "5m5s" # Maximum time to write HTTP response + upstream_timeout: "5m" # Maximum duration of upstream function call - should be more than read_timeout and write_timeout + dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD faas_nats_address: "nats" faas_nats_port: 4222 - direct_functions: "true" # Functions are invoked directly over the overlay network + direct_functions: "true" # Functions are invoked directly over the overlay network direct_functions_suffix: "" basic_auth: "${BASIC_AUTH:-true}" secret_mount_path: "/run/secrets/" - scale_from_zero: "true" + scale_from_zero: "true" # Enable if you want functions to scale from 0/0 to min replica count upon invoke + max_idle_conns: 1024 + max_idle_conns_per_host: 1024 deploy: resources: - # limits: # uncomment to enable limits - # memory: 100M + # limits: # Enable if you want to limit memory usage + # memory: 200M reservations: memory: 100M restart_policy: @@ -36,17 +39,16 @@ services: - basic-auth-user - basic-auth-password - # Docker Swarm provider faas-swarm: - image: openfaas/faas-swarm:0.6.1-armhf volumes: - "/var/run/docker.sock:/var/run/docker.sock" + image: openfaas/faas-swarm:0.6.1-armhf networks: - functions environment: - read_timeout: "305s" # set both here, and on your functions - write_timeout: "305s" # set both here, and on your functions + read_timeout: "5m5s" # set both here, and on your functions + write_timeout: "5m5s" # set both here, and on your functions DOCKER_API_VERSION: "1.30" basic_auth: "${BASIC_AUTH:-true}" secret_mount_path: "/run/secrets/" @@ -56,7 +58,7 @@ services: - 'node.role == manager' - 'node.platform.os == linux' resources: - # limits: # uncomment to enable limits + # limits: # Enable if you want to limit memory usage # memory: 100M reservations: memory: 100M @@ -69,7 +71,6 @@ services: - basic-auth-user - basic-auth-password - nats: image: nats-streaming:0.11.2 # Uncomment the following port mappings if you wish to expose the @@ -96,8 +97,8 @@ services: - functions environment: max_inflight: "1" - ack_wait: "30s" # Max duration of any async task / request - basic_auth: "false" + ack_wait: "5m5s" # Max duration of any async task / request + basic_auth: "${BASIC_AUTH:-true}" secret_mount_path: "/run/secrets/" deploy: resources: @@ -113,6 +114,10 @@ services: placement: constraints: - 'node.platform.os == linux' + secrets: + - basic-auth-user + - basic-auth-password + # End services # Start monitoring @@ -149,7 +154,8 @@ services: environment: no_proxy: "gateway" command: - - '-config.file=/alertmanager.yml' + - '--config.file=/alertmanager.yml' + - '--storage.path=/alertmanager' networks: - functions # Uncomment the following port mapping if you wish to expose the Prometheus @@ -172,6 +178,7 @@ services: secrets: - basic-auth-password + configs: prometheus_config: file: ./prometheus/prometheus.yml @@ -192,4 +199,3 @@ secrets: external: true basic-auth-password: external: true - diff --git a/docker-compose.yml b/docker-compose.yml index db39f059..c7d162a6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: functions_provider_url: "http://faas-swarm:8080/" read_timeout: "5m5s" # Maximum time to read HTTP request write_timeout: "5m5s" # Maximum time to write HTTP response - upstream_timeout: "5m" # Maximum duration of upstream function call - should be more than read_timeout and write_timeout + upstream_timeout: "5m" # Maximum duration of upstream function call - should be more than read_timeout and write_timeout dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD faas_nats_address: "nats" faas_nats_port: 4222 @@ -19,7 +19,7 @@ services: basic_auth: "${BASIC_AUTH:-true}" secret_mount_path: "/run/secrets/" scale_from_zero: "true" # Enable if you want functions to scale from 0/0 to min replica count upon invoke - max_idle_conns: 1024 + max_idle_conns: 1024 max_idle_conns_per_host: 1024 deploy: resources: