mirror of
https://github.com/openfaas/faas.git
synced 2025-06-16 21:06:54 +00:00
Enable basic auth for armhf stack
- basic auth is now optional for armhf - finishes work of #999 Happy Holidays Signed-off-by: Alex Ellis (VMware) <alexellis2@gmail.com>
This commit is contained in:
parent
a02e2d2aa2
commit
ea40055c60
@ -15,9 +15,9 @@ services:
|
|||||||
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: "false"
|
basic_auth: "${BASIC_AUTH:-true}"
|
||||||
secret_mount_path: "/run/secrets/"
|
secret_mount_path: "/run/secrets/"
|
||||||
scale_from_zero: "false"
|
scale_from_zero: "true"
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
# limits: # uncomment to enable limits
|
# limits: # uncomment to enable limits
|
||||||
@ -32,6 +32,10 @@ services:
|
|||||||
placement:
|
placement:
|
||||||
constraints:
|
constraints:
|
||||||
- 'node.platform.os == linux'
|
- 'node.platform.os == linux'
|
||||||
|
secrets:
|
||||||
|
- basic-auth-user
|
||||||
|
- basic-auth-password
|
||||||
|
|
||||||
|
|
||||||
# Docker Swarm provider
|
# Docker Swarm provider
|
||||||
faas-swarm:
|
faas-swarm:
|
||||||
@ -44,7 +48,8 @@ services:
|
|||||||
read_timeout: "305s" # set both here, and on your functions
|
read_timeout: "305s" # set both here, and on your functions
|
||||||
write_timeout: "305s" # set both here, and on your functions
|
write_timeout: "305s" # set both here, and on your functions
|
||||||
DOCKER_API_VERSION: "1.30"
|
DOCKER_API_VERSION: "1.30"
|
||||||
basic_auth: "false"
|
basic_auth: "${BASIC_AUTH:-true}"
|
||||||
|
secret_mount_path: "/run/secrets/"
|
||||||
deploy:
|
deploy:
|
||||||
placement:
|
placement:
|
||||||
constraints:
|
constraints:
|
||||||
@ -60,6 +65,10 @@ services:
|
|||||||
delay: 5s
|
delay: 5s
|
||||||
max_attempts: 20
|
max_attempts: 20
|
||||||
window: 380s
|
window: 380s
|
||||||
|
secrets:
|
||||||
|
- basic-auth-user
|
||||||
|
- basic-auth-password
|
||||||
|
|
||||||
|
|
||||||
nats:
|
nats:
|
||||||
image: nats-streaming:0.11.2
|
image: nats-streaming:0.11.2
|
||||||
@ -176,3 +185,10 @@ networks:
|
|||||||
attachable: true
|
attachable: true
|
||||||
labels:
|
labels:
|
||||||
- "openfaas=true"
|
- "openfaas=true"
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
basic-auth-user:
|
||||||
|
external: true
|
||||||
|
basic-auth-password:
|
||||||
|
external: true
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user