Skip to content
Snippets Groups Projects
Commit 2bd6383d authored by Lucas Roesler's avatar Lucas Roesler Committed by Alex Ellis
Browse files

Update swam provider version in compose to 0.8.2 


**What**
- Bump faas-swarm vesion to latest, 0.8.2
- Bump arm64 and armhf sevices to their latest versions
- The docker-compose files were invalid when deployed directly because
  the auth url was not configured.  Set the default for basic auth to
  false to make this a valid configuration

Signed-off-by: default avatarLucas Roesler <roesler.lucas@gmail.com>
parent 4822e414
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
docker-compose.arm64.yml
+ 8
− 8
View file @ 2bd6383d
...@@ -3,7 +3,7 @@ services: ...@@ -3,7 +3,7 @@ services:
gateway: gateway:
ports: ports:
- 8080:8080 - 8080:8080
image: openfaas/gateway:0.15.3-arm64 image: openfaas/gateway:0.18.2-arm64
networks: networks:
- functions - functions
environment: environment:
...@@ -16,7 +16,7 @@ services: ...@@ -16,7 +16,7 @@ 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: "${BASIC_AUTH:-true}" basic_auth: "${BASIC_AUTH:-false}"
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
...@@ -40,10 +40,10 @@ services: ...@@ -40,10 +40,10 @@ services:
secrets: secrets:
- basic-auth-user - basic-auth-user
- basic-auth-password - basic-auth-password
# auth service provide basic-auth plugin for system APIs # auth service provide basic-auth plugin for system APIs
basic-auth-plugin: basic-auth-plugin:
image: openfaas/basic-auth-plugin:0.15.3-arm64 image: openfaas/basic-auth-plugin:0.18.2-arm64
networks: networks:
- functions - functions
environment: environment:
...@@ -74,14 +74,14 @@ services: ...@@ -74,14 +74,14 @@ services:
faas-swarm: faas-swarm:
volumes: volumes:
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
image: openfaas/faas-swarm:0.6.2-arm64 image: openfaas/faas-swarm:0.8.2-arm64
networks: networks:
- functions - functions
environment: environment:
read_timeout: "5m5s" # 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 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:-false}"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
gateway_invoke: "true" gateway_invoke: "true"
faas_gateway_address: "gateway" faas_gateway_address: "gateway"
...@@ -125,13 +125,13 @@ services: ...@@ -125,13 +125,13 @@ services:
- 'node.platform.os == linux' - 'node.platform.os == linux'
queue-worker: queue-worker:
image: openfaas/queue-worker:0.7.2-arm64 image: openfaas/queue-worker:0.8.1-arm64
networks: networks:
- functions - functions
environment: environment:
max_inflight: "1" max_inflight: "1"
ack_wait: "5m5s" # 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:-false}"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
deploy: deploy:
resources: resources:
......
docker-compose.armhf.yml
+ 8
− 8
View file @ 2bd6383d
...@@ -3,7 +3,7 @@ services: ...@@ -3,7 +3,7 @@ services:
gateway: gateway:
ports: ports:
- 8080:8080 - 8080:8080
image: openfaas/gateway:0.17.3-armhf image: openfaas/gateway:0.18.2-armhf
networks: networks:
- functions - functions
environment: environment:
...@@ -16,7 +16,7 @@ services: ...@@ -16,7 +16,7 @@ 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: "${BASIC_AUTH:-true}" basic_auth: "${BASIC_AUTH:-false}"
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
...@@ -40,10 +40,10 @@ services: ...@@ -40,10 +40,10 @@ services:
secrets: secrets:
- basic-auth-user - basic-auth-user
- basic-auth-password - basic-auth-password
# auth service provide basic-auth plugin for system APIs # auth service provide basic-auth plugin for system APIs
basic-auth-plugin: basic-auth-plugin:
image: openfaas/basic-auth-plugin:0.15.4-armhf image: openfaas/basic-auth-plugin:0.18.2-armhf
networks: networks:
- functions - functions
environment: environment:
...@@ -73,14 +73,14 @@ services: ...@@ -73,14 +73,14 @@ services:
faas-swarm: faas-swarm:
volumes: volumes:
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
image: openfaas/faas-swarm:0.7.1-armhf image: openfaas/faas-swarm:0.8.2-armhf
networks: networks:
- functions - functions
environment: environment:
read_timeout: "5m5s" # 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 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:-false}"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
deploy: deploy:
placement: placement:
...@@ -122,13 +122,13 @@ services: ...@@ -122,13 +122,13 @@ services:
- 'node.platform.os == linux' - 'node.platform.os == linux'
queue-worker: queue-worker:
image: openfaas/queue-worker:0.7.2-armhf image: openfaas/queue-worker:0.8.1-armhf
networks: networks:
- functions - functions
environment: environment:
max_inflight: "1" max_inflight: "1"
ack_wait: "5m5s" # 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:-false}"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
gateway_invoke: "true" gateway_invoke: "true"
faas_gateway_address: "gateway" faas_gateway_address: "gateway"
......
docker-compose.yml
+ 7
− 7
View file @ 2bd6383d
...@@ -3,7 +3,7 @@ services: ...@@ -3,7 +3,7 @@ services:
gateway: gateway:
ports: ports:
- 8080:8080 - 8080:8080
image: openfaas/gateway:0.17.3 image: openfaas/gateway:0.18.2
networks: networks:
- functions - functions
environment: environment:
...@@ -16,7 +16,7 @@ services: ...@@ -16,7 +16,7 @@ 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: "${BASIC_AUTH:-true}" basic_auth: "${BASIC_AUTH:-false}"
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
...@@ -43,7 +43,7 @@ services: ...@@ -43,7 +43,7 @@ services:
# auth service provide basic-auth plugin for system APIs # auth service provide basic-auth plugin for system APIs
basic-auth-plugin: basic-auth-plugin:
image: openfaas/basic-auth-plugin:0.17.0 image: openfaas/basic-auth-plugin:0.18.2
networks: networks:
- functions - functions
environment: environment:
...@@ -73,14 +73,14 @@ services: ...@@ -73,14 +73,14 @@ services:
faas-swarm: faas-swarm:
volumes: volumes:
- "/var/run/docker.sock:/var/run/docker.sock" - "/var/run/docker.sock:/var/run/docker.sock"
image: openfaas/faas-swarm:0.7.3 image: openfaas/faas-swarm:0.8.2
networks: networks:
- functions - functions
environment: environment:
read_timeout: "5m5s" # 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 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:-false}"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
deploy: deploy:
placement: placement:
...@@ -122,13 +122,13 @@ services: ...@@ -122,13 +122,13 @@ services:
- "node.platform.os == linux" - "node.platform.os == linux"
queue-worker: queue-worker:
image: openfaas/queue-worker:0.8.0 image: openfaas/queue-worker:0.8.1
networks: networks:
- functions - functions
environment: environment:
max_inflight: "1" max_inflight: "1"
ack_wait: "5m5s" # 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:-false}"
secret_mount_path: "/run/secrets/" secret_mount_path: "/run/secrets/"
gateway_invoke: "true" gateway_invoke: "true"
faas_gateway_address: "gateway" faas_gateway_address: "gateway"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment