# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1707134304 -3600
# Node ID a5882a40ccb6e1ddd057223b1888514f8cba835a
# Parent  087888659ba3846dc8b01c808797966bb6484d68
rename osimis/orthanc to orthancteam/orthanc

diff -r 087888659ba3 -r a5882a40ccb6 NewTests/Concurrency/docker-compose-transfers-concurrency.yml
--- a/NewTests/Concurrency/docker-compose-transfers-concurrency.yml	Mon Feb 05 09:50:24 2024 +0100
+++ b/NewTests/Concurrency/docker-compose-transfers-concurrency.yml	Mon Feb 05 12:58:24 2024 +0100
@@ -2,7 +2,7 @@
 services:
 
   orthanc-pg-a:
-    image: ${ORTHANC_IMAGE_UNDER_TESTS:-osimis/orthanc:latest}
+    image: ${ORTHANC_IMAGE_UNDER_TESTS:-orthancteam/orthanc:latest}
     container_name: orthanc-pg-a
     depends_on: [pg-a]
     restart: unless-stopped
@@ -30,7 +30,7 @@
       ORTHANC__OVERWRITE_INSTANCES: "true"
 
   orthanc-pg-b:
-    image: ${ORTHANC_IMAGE_UNDER_TESTS:-osimis/orthanc:latest}
+    image: ${ORTHANC_IMAGE_UNDER_TESTS:-orthancteam/orthanc:latest}
     container_name: orthanc-pg-b
     depends_on: [pg-b]
     restart: unless-stopped
diff -r 087888659ba3 -r a5882a40ccb6 NewTests/Concurrency/test_transfer.py
--- a/NewTests/Concurrency/test_transfer.py	Mon Feb 05 09:50:24 2024 +0100
+++ b/NewTests/Concurrency/test_transfer.py	Mon Feb 05 12:58:24 2024 +0100
@@ -18,15 +18,28 @@
     def cleanup(cls):
         os.chdir(here)
         print("Cleaning old compose")
-        subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "down", "-v", "--remove-orphans"], check=True)
+        subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "down", "-v", "--remove-orphans"], 
+                       env= {
+                           "ORTHANC_IMAGE_UNDER_TESTS": Helpers.orthanc_under_tests_docker_image
+                       },
+                       check=True)
 
     @classmethod
     def compose_up(cls):
-        print("Pullling containers")
-        subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "pull"], check=True)        
+        # print("Pullling containers")
+        # subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "pull"],
+        #                env= {
+        #                    "ORTHANC_IMAGE_UNDER_TESTS": Helpers.orthanc_under_tests_docker_image,
+        #                    "PATH": os.environ.get('PATH')
+        #                },
+        #                check=True)
 
         print("Compose up")
-        subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "up", "-d"], check=True)        
+        subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "up", "-d"], 
+                       env= {
+                           "ORTHANC_IMAGE_UNDER_TESTS": Helpers.orthanc_under_tests_docker_image
+                       },                       
+                       check=True)        
 
     @classmethod
     def setUpClass(cls):
diff -r 087888659ba3 -r a5882a40ccb6 NewTests/PostgresUpgrades/docker-compose.yml
--- a/NewTests/PostgresUpgrades/docker-compose.yml	Mon Feb 05 09:50:24 2024 +0100
+++ b/NewTests/PostgresUpgrades/docker-compose.yml	Mon Feb 05 12:58:24 2024 +0100
@@ -3,7 +3,7 @@
 
   # Orthanc with PG plugin v2
   orthanc-pg-15-2:
-    image: osimis/orthanc:18.4.3
+    image: orthancteam/orthanc:18.4.3
     container_name: orthanc-pg-15-2
     depends_on: [pg-15]
     restart: unless-stopped
@@ -18,7 +18,7 @@
 
   # Orthanc previous version
   orthanc-pg-15-61:
-    image: osimis/orthanc:24.1.2
+    image: orthancteam/orthanc:24.1.2
     container_name: orthanc-pg-15-61
     depends_on: [pg-15]
     restart: unless-stopped
@@ -31,7 +31,7 @@
 
   # Orthanc previous version to run the integration tests
   orthanc-pg-15-61-for-integ-tests:
-    image: osimis/orthanc:24.1.2
+    image: orthancteam/orthanc:24.1.2
     container_name: orthanc-pg-15-61-for-integ-tests
     depends_on: [pg-15]
     restart: unless-stopped
@@ -60,7 +60,7 @@
 
   # Orthanc latest version
   orthanc-pg-15-under-tests:
-    image: ${ORTHANC_IMAGE_UNDER_TESTS:-osimis/orthanc:latest}
+    image: ${ORTHANC_IMAGE_UNDER_TESTS:-orthancteam/orthanc:latest}
     container_name: orthanc-pg-15-under-tests
     depends_on: [pg-15]
     restart: unless-stopped
@@ -95,7 +95,7 @@
 
   # Orthanc latest version
   orthanc-pg-9-under-tests:
-    image: ${ORTHANC_IMAGE_UNDER_TESTS:-osimis/orthanc:latest}
+    image: ${ORTHANC_IMAGE_UNDER_TESTS:-orthancteam/orthanc:latest}
     container_name: orthanc-pg-9-under-tests
     depends_on: [pg-9]
     restart: unless-stopped
diff -r 087888659ba3 -r a5882a40ccb6 NewTests/README
--- a/NewTests/README	Mon Feb 05 09:50:24 2024 +0100
+++ b/NewTests/README	Mon Feb 05 12:58:24 2024 +0100
@@ -40,8 +40,8 @@
 with Docker:
 
 python3 NewTests/main.py --pattern=* \
-                         --orthanc_under_tests_docker_image=osimis/orthanc:current \
-                         --orthanc_previous_version_docker_image=osimis/orthanc:22.4.0 \
+                         --orthanc_under_tests_docker_image=orthancteam/orthanc:current \
+                         --orthanc_previous_version_docker_image=orthancteam/orthanc:22.4.0 \
                          --orthanc_under_tests_http_port=8043
 
 Housekeeper:
@@ -148,8 +148,8 @@
 with Docker:
 
 python3 NewTests/main.py --pattern=Authorization.test_authorization.TestAuthorization.* \
-                         --orthanc_under_tests_docker_image=osimis/orthanc:current \
-                         --orthanc_previous_version_docker_image=osimis/orthanc:22.4.0 \
+                         --orthanc_under_tests_docker_image=orthancteam/orthanc:current \
+                         --orthanc_previous_version_docker_image=orthancteam/orthanc:22.4.0 \
                          --orthanc_under_tests_http_port=8043
 
 
@@ -168,7 +168,7 @@
 with Docker:
 
 python3 NewTests/main.py --pattern=Concurrency.test_concurrency.TestConcurrency.* \
-                         --orthanc_under_tests_docker_image=osimis/orthanc:current \
+                         --orthanc_under_tests_docker_image=orthancteam/orthanc:current \
                          --orthanc_under_tests_http_port=8043
 
 PG upgrades:
@@ -177,4 +177,4 @@
 with Docker:
 
 python3 NewTests/main.py --pattern=PostgresUpgrades.test_pg_upgrades.TestPgUpgrades.* \
-                         --orthanc_under_tests_docker_image=osimis/orthanc:current
+                         --orthanc_under_tests_docker_image=orthancteam/orthanc:current