Move task-api docker repo to golemfactoryapps

golem/apps/default.py

@@ -9,18 +9,18 @@
 from golem.marketplace import RequestorBrassMarketStrategy
 
 BlenderAppDefinition = AppDefinition(
-    name='golemfactory/blenderapp',
+    name='golemfactoryapps/blenderapp',
     author='Golem Factory GmbH',
     license='GPLv3',
-    version='0.7.2',
+    version='0.7.3',
     description=(
         'Rendering with Blender, the free and open source '
         '3D creation suite'
     ),
     requestor_env=DOCKER_CPU_ENV_ID,
     requestor_prereq=dict(
-        image='golemfactory/blenderapp',
-        tag='0.7.2',
+        image='golemfactoryapps/blenderapp',
+        tag='0.7.3',
     ),
     market_strategy=RequestorBrassMarketStrategy,
     max_benchmark_score=10000.,

golem/apps/manager.py

@@ -12,6 +12,7 @@
     load_apps_from_dir
 )
 from golem.apps.downloader import download_definitions
+from golem.apps.default import save_built_in_app_definitions
 from golem.model import AppConfiguration
 from golem.report import EventPublisher
 from golem.rpc.mapping.rpceventnames import App
@@ -32,6 +33,7 @@ def __init__(self, app_dir: Path, download_apps: bool = True) -> None:
         # Download default apps then load all apps from path
         if download_apps:
             self.update_apps(register_apps=False)
+            save_built_in_app_definitions(app_dir)
         for app_def_path, app_def in load_apps_from_dir(app_dir):
             self.register_app(app_def)
             self._app_file_names[app_def.id] = app_def_path

golem/envs/default.py

@@ -12,7 +12,7 @@
 from golem.task.envmanager import EnvironmentManager
 from golem.task.task_api.docker import DockerTaskApiPayloadBuilder
 
-DOCKER_REPOSITORY = "golemfactory"
+DOCKER_REPOSITORY = "golemfactoryapps"
 
 
 def _register_docker_cpu_env(

golem/envs/docker/cpu.py

@@ -526,7 +526,7 @@ class DockerCPUEnvironment(EnvironmentBase):
         'sys_tty_config'
     ]
 
-    BENCHMARK_IMAGE = 'golemfactory/cpu_benchmark:1.0'
+    BENCHMARK_IMAGE = 'golemfactoryapps/cpu_benchmark:1.0'
 
     @classmethod
     def supported(cls) -> EnvSupportStatus:

golem/envs/docker/gpu.py

@@ -90,7 +90,7 @@ class DockerGPURuntime(DockerCPURuntime):
 
 class DockerGPUEnvironment(DockerCPUEnvironment):
 
-    BENCHMARK_IMAGE = 'golemfactory/gpu_benchmark:1.0'
+    BENCHMARK_IMAGE = 'golemfactoryapps/gpu_benchmark:1.0'
 
     # Enforce DockerGPUConfig config class type (DockerCPUConfig in super)
     def __init__(  # pylint: disable=useless-super-delegation

scripts/node_integration_tests/tasks/__init__.py

@@ -167,7 +167,7 @@
     },
     'task_api_blender': {
         'golem': {
-            'app_id': BlenderAppDefinition.id,
+            'app_id': '6b39331ac73484ff596447cefdfba9e5',
             'name': '',
             'resources': [],
             'max_price_per_hour': str(10 ** 18),

scripts/task_api_tests/task-api-readme.md

@@ -16,7 +16,7 @@ Here is an example of a new task-api JSON file.
 ```JSON
 {
     "golem": {
-        "app_id": "daec55c08c9de7b71bf4ec3eb759c83b",
+        "app_id": "6b39331ac73484ff596447cefdfba9e5",
         "name": "",
         "resources": ["/absolute/path/to/resources/file.blend"],
         "max_price_per_hour": "1_000_000_000_000_000_000",
@@ -40,7 +40,7 @@ The golem block of the JSON is meant for the input Golem needs, these are the sa
 ```
 ...
     "golem": {
-        "app_id": "daec55c08c9de7b71bf4ec3eb759c83b",
+        "app_id": "6b39331ac73484ff596447cefdfba9e5",
         "name": "",
         "resources": ["/absolute/path/to/resources/file.blend"],
         "max_price_per_hour": "1_000_000_000_000_000_000",
@@ -56,7 +56,7 @@ The golem block of the JSON is meant for the input Golem needs, these are the sa
 
 App id is the unique identifier of the app including its version.
 You can get the build in app_id's from the logs when starting golem
-`daec55c08c9de7b71bf4ec3eb759c83b` is `golemfactory/blenderapp:0.7.2` the only available option at the time.
+`6b39331ac73484ff596447cefdfba9e5` is `golemfactory/blenderapp:0.7.2` the only available option at the time.
 
 #### golem.name