faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-10 09:16:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reconcile Docker Compose files for each architecture

Browse Source 
Signed-off-by: Radoslav Dimitrov <dimitrovr@vmware.com>
This commit is contained in:
Radoslav Dimitrov 2019-01-30 11:17:55 +02:00 committed by Alex Ellis
parent 8a8735ee59
commit 59c88bc7e5
3 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docker-compose.arm64.yml
View File

@ -8,21 +8,23 @@ services:
- functions - functions
environment: environment:
functions_provider_url: "http://faas-swarm:8080/" functions_provider_url: "http://faas-swarm:8080/"
read_timeout: "300s" # Maximum time to read HTTP request read_timeout: "5m5s" # Maximum time to read HTTP request
write_timeout: "300s" # Maximum time to write HTTP response write_timeout: "5m5s" # Maximum time to write HTTP response
upstream_timeout: "300s" # 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 dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD
faas_nats_address: "nats" faas_nats_address: "nats"
faas_nats_port: 4222 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: "" direct_functions_suffix: ""
basic_auth: "${BASIC_AUTH:-true}" basic_auth: "${BASIC_AUTH:-true}"
secret_mount_path: "/run/secrets/" 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: deploy:
resources: resources:
# limits: # Enable if you want to limit memory usage # limits: # Enable if you want to limit memory usage
# memory: 100M # memory: 200M
reservations: reservations:
memory: 100M memory: 100M
restart_policy: restart_policy:
@ -39,14 +41,14 @@ services:
# Docker Swarm provider # Docker Swarm provider
faas-swarm: faas-swarm:
image: openfaas/faas-swarm:0.6.1-arm64
volumes: volumes:
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
image: openfaas/faas-swarm:0.6.1-arm64
networks: networks:
- functions - functions
environment: environment:
read_timeout: "300s" # set both here, and on your functions read_timeout: "5m5s" # set both here, and on your functions
write_timeout: "300s" # set both here, and on your functions write_timeout: "5m5s" # set both here, and on your functions
DOCKER_API_VERSION: "1.30" DOCKER_API_VERSION: "1.30"
basic_auth: "${BASIC_AUTH:-true}" basic_auth: "${BASIC_AUTH:-true}"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
@ -95,7 +97,7 @@ services:
- functions - functions
environment: environment:
max_inflight: "1" 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}" basic_auth: "${BASIC_AUTH:-true}"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
deploy: deploy:

40
docker-compose.armhf.yml
View File

@ -8,20 +8,23 @@ services:
- functions - functions
environment: environment:
functions_provider_url: "http://faas-swarm:8080/" functions_provider_url: "http://faas-swarm:8080/"
read_timeout: "305s" # Maximum time to read HTTP request read_timeout: "5m5s" # Maximum time to read HTTP request
write_timeout: "305s" # Maximum time to write HTTP response write_timeout: "5m5s" # 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 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_address: "nats"
faas_nats_port: 4222 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: "" direct_functions_suffix: ""
basic_auth: "${BASIC_AUTH:-true}" basic_auth: "${BASIC_AUTH:-true}"
secret_mount_path: "/run/secrets/" 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: deploy:
resources: resources:
# limits: # uncomment to enable limits # limits: # Enable if you want to limit memory usage
# memory: 100M # memory: 200M
reservations: reservations:
memory: 100M memory: 100M
restart_policy: restart_policy:
@ -36,17 +39,16 @@ services:
- basic-auth-user - basic-auth-user
- basic-auth-password - basic-auth-password
# Docker Swarm provider # Docker Swarm provider
faas-swarm: faas-swarm:
image: openfaas/faas-swarm:0.6.1-armhf
volumes: volumes:
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
image: openfaas/faas-swarm:0.6.1-armhf
networks: networks:
- functions - functions
environment: environment:
read_timeout: "305s" # set both here, and on your functions read_timeout: "5m5s" # set both here, and on your functions
write_timeout: "305s" # set both here, and on your functions write_timeout: "5m5s" # set both here, and on your functions
DOCKER_API_VERSION: "1.30" DOCKER_API_VERSION: "1.30"
basic_auth: "${BASIC_AUTH:-true}" basic_auth: "${BASIC_AUTH:-true}"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
@ -56,7 +58,7 @@ services:
- 'node.role == manager' - 'node.role == manager'
- 'node.platform.os == linux' - 'node.platform.os == linux'
resources: resources:
# limits: # uncomment to enable limits # limits: # Enable if you want to limit memory usage
# memory: 100M # memory: 100M
reservations: reservations:
memory: 100M memory: 100M
@ -69,7 +71,6 @@ services:
- basic-auth-user - basic-auth-user
- basic-auth-password - basic-auth-password
nats: nats:
image: nats-streaming:0.11.2 image: nats-streaming:0.11.2
# Uncomment the following port mappings if you wish to expose the # Uncomment the following port mappings if you wish to expose the
@ -96,8 +97,8 @@ services:
- functions - functions
environment: environment:
max_inflight: "1" max_inflight: "1"
ack_wait: "30s" # Max duration of any async task / request ack_wait: "5m5s" # Max duration of any async task / request
basic_auth: "false" basic_auth: "${BASIC_AUTH:-true}"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
deploy: deploy:
resources: resources:
@ -113,6 +114,10 @@ services:
placement: placement:
constraints: constraints:
- 'node.platform.os == linux' - 'node.platform.os == linux'
secrets:
- basic-auth-user
- basic-auth-password
# End services # End services
# Start monitoring # Start monitoring
@ -149,7 +154,8 @@ services:
environment: environment:
no_proxy: "gateway" no_proxy: "gateway"
command: command:
- '-config.file=/alertmanager.yml' - '--config.file=/alertmanager.yml'
- '--storage.path=/alertmanager'
networks: networks:
- functions - functions
# Uncomment the following port mapping if you wish to expose the Prometheus # Uncomment the following port mapping if you wish to expose the Prometheus
@ -172,6 +178,7 @@ services:
secrets: secrets:
- basic-auth-password - basic-auth-password
configs: configs:
prometheus_config: prometheus_config:
file: ./prometheus/prometheus.yml file: ./prometheus/prometheus.yml
@ -192,4 +199,3 @@ secrets:
external: true external: true
basic-auth-password: basic-auth-password:
external: true external: true

4
docker-compose.yml
View File

@ -10,7 +10,7 @@ services:
functions_provider_url: "http://faas-swarm:8080/" functions_provider_url: "http://faas-swarm:8080/"
read_timeout: "5m5s" # Maximum time to read HTTP request read_timeout: "5m5s" # Maximum time to read HTTP request
write_timeout: "5m5s" # Maximum time to write HTTP response 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 dnsrr: "true" # Temporarily use dnsrr in place of VIP while issue persists on PWD
faas_nats_address: "nats" faas_nats_address: "nats"
faas_nats_port: 4222 faas_nats_port: 4222
@ -19,7 +19,7 @@ services:
basic_auth: "${BASIC_AUTH:-true}" basic_auth: "${BASIC_AUTH:-true}"
secret_mount_path: "/run/secrets/" 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 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 max_idle_conns_per_host: 1024
deploy: deploy:
resources: resources: