fix: fanuc demo

robofit · Mar 27, 2024 · 6ffb95e · 6ffb95e
1 parent 567cd48
commit 6ffb95e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 33 deletions.
diff --git a/compose-files/fanuc-demo/docker-compose.yml b/compose-files/fanuc-demo/docker-compose.yml
@@ -1,14 +1,12 @@
-version: '3'
-
 services:
   fanuc-demo-arserver:
-    image: arcor2/arcor2_arserver:0.24.0
+    image: arcor2/arcor2_arserver:1.1.1
     container_name: fanuc-demo-arserver
     depends_on:
       - fanuc-demo-project
       - fanuc-demo-build
       - fanuc-demo-execution
-      - fanuc-demo-mocks
+      - fanuc-demo-scene
       - fanuc-demo-calibration
       - fanuc-demo-robot
     ports:
@@ -17,56 +15,59 @@ services:
     networks:
           - fanuc-demo-scene-network
           - fanuc-demo-project-network
+          - fanuc-demo-asset-network
           - fanuc-demo-calibration-network
           - fanuc-demo-robot-network
     environment:
       - ARCOR2_PROJECT_SERVICE_URL=http://fanuc-demo-project:10000
-      - ARCOR2_SCENE_SERVICE_URL=http://fanuc-demo-mocks:5013
+      - ARCOR2_ASSET_SERVICE_URL=http://fanuc-demo-asset:10040
+      - ARCOR2_SCENE_SERVICE_URL=http://fanuc-demo-scene:5013
       - ARCOR2_EXECUTION_URL=ws://fanuc-demo-execution:6790
       - ARCOR2_BUILD_URL=http://fanuc-demo-build:5008
       - ARCOR2_CALIBRATION_URL=http://fanuc-demo-calibration:5014
 
   fanuc-demo-build:
-    image: arcor2/arcor2_build:0.22.0
+    image: arcor2/arcor2_build:1.3.2
     container_name: fanuc-demo-build
     depends_on:
       - fanuc-demo-project
     environment:
       - ARCOR2_PROJECT_SERVICE_URL=http://fanuc-demo-project:10000
+      - ARCOR2_PROJECT_PATH=""
     ports:
       - "5008:5008"
     networks:           
       - fanuc-demo-project-network
 
   fanuc-demo-execution:
-    image: arcor2/arcor2_execution:0.20.0
+    image: arcor2/arcor2_execution:1.2.0
     container_name: fanuc-demo-execution
     networks:
       - fanuc-demo-execution-network
       - fanuc-demo-scene-network
       - fanuc-demo-robot-network
     environment:
-      - ARCOR2_SCENE_SERVICE_URL=http://fanuc-demo-mocks:5013
+      - ARCOR2_SCENE_SERVICE_URL=http://fanuc-demo-scene:5013
       - ARCOR2_PROJECT_PATH=/root/project
     volumes:
         - fanuc-demo-execution:/root/project
 
   fanuc-demo-robot:
-    image: arcor2/arcor2_fanuc:0.1.0
+    image: arcor2/arcor2_fanuc:0.3.0
     container_name: fanuc-demo-robot
     restart: on-failure:3  # TODO it often fails to contact Scene Service when starting, remove once we have healthcheck
     depends_on:
-      - fanuc-demo-mocks
+      - fanuc-demo-scene
     networks:
       - fanuc-demo-robot
       - fanuc-demo-scene-network
     ports:
         - "5027:5027"
     environment:
-      - ARCOR2_SCENE_SERVICE_URL=http://fanuc-demo-mocks:5013
+      - ARCOR2_SCENE_SERVICE_URL=http://fanuc-demo-scene:5013
 
   fanuc-demo-calibration:
-    image: arcor2/arcor2_calibration:0.7.0
+    image: arcor2/arcor2_calibration:1.1.0
     networks:
       - fanuc-demo-calibration-network
     ports:
@@ -77,43 +78,43 @@ services:
     volumes:
       - ./calibration.yaml:/root/calibration.yaml
 
-  fanuc-demo-mocks:
-    image: arcor2/arcor2_mocks:0.17.1
-    container_name: fanuc-demo-mocks
+  fanuc-demo-scene:
+    image: arcor2/arcor2_scene:1.0.0
+    container_name: fanuc-demo-scene
     networks:
-          - fanuc-demo-scene-network
+      - fanuc-demo-scene-network
     ports:
       - "5013:5013"
 
-  fanuc-demo-assets:
-    image: registry.gitlab.com/kinalisoft/test-it-off/assets:0.1.4
-    container_name: "fanuc-demo-assets"
+  fanuc-demo-asset:
+    image: registry.gitlab.com/kinalisoft/test-it-off/asset:1.0.0
+    container_name: "fanuc-demo-asset"
     environment:
-        - "ASSETS_FOLDER=/tmp/assets"
+        - "ASSETS_FOLDER=/tmp/asset"
     volumes:
-        - fanuc-demo-assets:/tmp/assets
+        - fanuc-demo-asset:/tmp/asset
     networks:
-        - fanuc-demo-assets-network
+        - fanuc-demo-asset-network
     expose:
-        - "20040"
+        - "10040"
     ports:
-        - "20040:20040"
+        - "10040:10040"
 
   fanuc-demo-project:
-    image: registry.gitlab.com/kinalisoft/test-it-off/project:0.17.6
+    image: registry.gitlab.com/kinalisoft/test-it-off/project:1.0.1
     container_name: "fanuc-demo-project"
     ports:
       - "10000-10001:10000-10001"
     environment:
-      - "ASSETS_SERVICE_URL=http://fanuc-demo-assets:20040"
+      - "ASSET_SERVICE_URL=http://fanuc-demo-asset:10040"
     depends_on:
-        - fanuc-demo-assets
+      - fanuc-demo-asset
     networks:
       - fanuc-demo-project-network
-      - fanuc-demo-assets-network
+      - fanuc-demo-asset-network
 
   fanuc-demo-nginx:
-    image: nginx:1.21.1
+    image: nginx:1.23.3
     container_name: "fanuc-demo-nginx"
     volumes:
       - ./nginx.conf:/etc/nginx/conf.d/default.conf
@@ -125,24 +126,26 @@ services:
       - fanuc-demo-project
 
   fanuc-demo-upload-object-types:
-    image: arcor2/arcor2_fanuc_upload_object_types:0.1.0
+    image: arcor2/arcor2_fanuc_upload_object_types:0.3.1
     container_name: "fanuc-demo-upload-object-types"
     depends_on:
       - fanuc-demo-project
     networks:
       - fanuc-demo-project-network
+      - fanuc-demo-asset-network
     environment:
       - ARCOR2_PROJECT_SERVICE_URL=http://fanuc-demo-project:10000
+      - ARCOR2_ASSET_SERVICE_URL=http://fanuc-demo-asset:10040
 
 
 volumes:
-  fanuc-demo-assets:
+  fanuc-demo-asset:
   fanuc-demo-execution:
 
 networks:
   fanuc-demo-scene-network:
   fanuc-demo-execution-network:
-  fanuc-demo-assets-network:
+  fanuc-demo-asset-network:
   fanuc-demo-project-network:
   fanuc-demo-robot-network:
   fanuc-demo-calibration-network:

diff --git a/src/docker/arcor2_fanuc_upload_object_types/BUILD b/src/docker/arcor2_fanuc_upload_object_types/BUILD
@@ -1,3 +1,3 @@
 docker_image(
-    name="arcor2_fanuc_upload_object_types", repository="arcor2/arcor2_fanuc_upload_object_types", image_tags=["0.3.0"]
+    name="arcor2_fanuc_upload_object_types", repository="arcor2/arcor2_fanuc_upload_object_types", image_tags=["0.3.1"]
 )