Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

Only include task_api apps on testnet #4871

Merged
merged 6 commits into from
Nov 12, 2019
Merged

Only include task_api apps on testnet #4871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a4e69c
Only include task_api apps on testnet
maaktweluit Nov 7, 2019
221b334
Add filter for adding task_headers based on configured IMG names
maaktweluit Nov 8, 2019
22ce08b
review comments, no need to split image name. made it private to help…
maaktweluit Nov 8, 2019
8e3bb64
Moved check from image name to environment
maaktweluit Nov 8, 2019
703908f
linter
maaktweluit Nov 8, 2019
c4195fb
Merge branch 'b0.22' into mwu/b0.22/task-api-mainnet-off
mfranciszkiewicz Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions golem/config/environments/mainnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
from typing import List

from golem_sci import contracts
from golem_sci.chains import MAINNET
Expand Down Expand Up @@ -79,3 +80,5 @@ def __init__(self):
'blender',
'blender_nvgpu'
)

TASK_API_ENVS: List[str] = []
5 changes: 5 additions & 0 deletions golem/config/environments/testnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from golem_sci import contracts
from golem_sci.chains import RINKEBY
from golem_task_api.envs import DOCKER_CPU_ENV_ID, DOCKER_GPU_ENV_ID

from golem.core.variables import PROTOCOL_CONST, CONCENT_CHOICES
from . import TESTNET, CONCENT_ENVIRONMENT_VARIABLE
Expand Down Expand Up @@ -88,3 +89,7 @@ def __init__(self):
'blender',
'blender_nvgpu'
)

TASK_API_ENVS = [
DOCKER_CPU_ENV_ID, DOCKER_GPU_ENV_ID
]
13 changes: 8 additions & 5 deletions golem/envs/default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@ def register_environments(
env_manager: EnvironmentManager
) -> None:

if NonHypervisedDockerCPUEnvironment.supported().supported:
_register_docker_cpu_env(work_dir, env_manager)

if NonHypervisedDockerGPUEnvironment.supported().supported:
_register_docker_gpu_env(work_dir, env_manager)
from golem.config.active import TASK_API_ENVS
if DOCKER_CPU_ENV_ID in TASK_API_ENVS:
if NonHypervisedDockerCPUEnvironment.supported().supported:
_register_docker_cpu_env(work_dir, env_manager)

if DOCKER_GPU_ENV_ID in TASK_API_ENVS:
if NonHypervisedDockerGPUEnvironment.supported().supported:
_register_docker_gpu_env(work_dir, env_manager)
4 changes: 2 additions & 2 deletions golem/envs/docker/whitelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import golem.model


def repository_from_image_name(image_name: str) -> str:
def _repository_from_image_name(image_name: str) -> str:
return image_name.rsplit('/', maxsplit=1)[0]


Expand Down Expand Up @@ -40,7 +40,7 @@ def remove(cls, repository: str) -> bool:

@staticmethod
def is_whitelisted(image_name: str) -> bool:
repository = repository_from_image_name(image_name)
repository = _repository_from_image_name(image_name)
query = \
golem.model.DockerWhitelist.select().where(
golem.model.DockerWhitelist.repository == repository,
Expand Down