diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py index 4e0ecd34..1bf7b184 100644 --- a/backend/app_sdk/app_base.py +++ b/backend/app_sdk/app_base.py @@ -55,7 +55,7 @@ class AppBase: # for action["parameters"] # print("AUTH: ", key, value) # params[item["key"]] = item["value"] - #except KeyError: + #except KeyError: # print("No authentication specified!") # pass diff --git a/docker-compose.yml b/docker-compose.yml index 66958b46..369db9d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,7 +50,7 @@ services: #- database orborus: #build: ./functions/onprem/orborus - image: ghcr.io/frikky/shuffle-orborus:0.8.97 + image: ghcr.io/frikky/shuffle-orborus:nightly container_name: shuffle-orborus hostname: shuffle-orborus networks: diff --git a/functions/onprem/orborus/build.sh b/functions/onprem/orborus/build.sh index 817a2227..61413801 100644 --- a/functions/onprem/orborus/build.sh +++ b/functions/onprem/orborus/build.sh @@ -1,5 +1,5 @@ NAME=shuffle-orborus -VERSION=0.8.90 +VERSION=0.8.97 echo "Running docker build with $NAME:$VERSION" #docker rmi frikky/shuffle:$NAME --force diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go index e9f9238e..767e63bf 100644 --- a/functions/onprem/orborus/orborus.go +++ b/functions/onprem/orborus/orborus.go @@ -123,16 +123,16 @@ func getThisContainerId() { func deployWorker(image string, identifier string, env []string) { // Binds is the actual "-v" volume. // Max 20% CPU every second + + //CPUQuota: 25000, + //CPUPeriod: 100000, + //CPUShares: 256, hostConfig := &container.HostConfig{ LogConfig: container.LogConfig{ Type: "json-file", Config: map[string]string{}, }, - Resources: container.Resources{ - CPUShares: 256, - CPUQuota: 25000, - CPUPeriod: 100000, - }, + Resources: container.Resources{}, Binds: []string{ "/var/run/docker.sock:/var/run/docker.sock:rw", }, diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go index a27be5ba..fb75a086 100644 --- a/functions/onprem/worker/worker.go +++ b/functions/onprem/worker/worker.go @@ -201,16 +201,15 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env [] ctx := context.Background() // Max 10% CPU every second + //CPUShares: 128, + //CPUQuota: 10000, + //CPUPeriod: 100000, hostConfig := &container.HostConfig{ LogConfig: container.LogConfig{ Type: "json-file", Config: map[string]string{}, }, - Resources: container.Resources{ - CPUShares: 128, - CPUQuota: 10000, - CPUPeriod: 100000, - }, + Resources: container.Resources{}, } // form container id and use it as network source if it's not empty