fix: remove embedded callback-handler-svc, use published image instead

mojaloop · May 1, 2024 · b01850e · b01850e
1 parent d4ab3b9
commit b01850e
Show file tree

Hide file tree

Showing 36 changed files with 12 additions and 22,016 deletions.
diff --git a/.env b/.env
@@ -23,7 +23,7 @@ TEST_SIMULATOR_VERSION=v11.1.3
 TEST_TTK_SVC_VERSION=v16.1.1
 TEST_TTK_UI_VERSION=v15.3.0
 TEST_TTK_CLI_VERSION=v1.2.0
-TEST_CALLBACK_HAND_SVC_VERSION=local
+TEST_CALLBACK_HAND_SVC_VERSION=latest
 
 ## Dependencies
 DEP_KAFKA_VERSION=3.5.0

diff --git a/docker-compose-perf.yml b/docker-compose-perf.yml
@@ -898,24 +898,17 @@ services:
       - ttk-provisioning-e2e
 
   callback-handler-svc-oracle-sim:
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     deploy:
       mode: replicated
       replicas: 1
     env_file:
       - .env
       - perf.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "30000:3001"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:
@@ -966,24 +959,17 @@ services:
       - all-services
 
   callback-handler-svc-cl-sim:
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     deploy:
       mode: replicated
       replicas: 1
     env_file:
       - .env
       - ./envs/cl-sim.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "3001:3001"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:
@@ -1018,25 +1004,18 @@ services:
     sysctls:
       # websockets do not have keep-alive, resulting in many TIME_WAIT sockets
       net.ipv4.tcp_tw_reuse: 1
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     deploy:
       mode: replicated
       replicas: 1
     env_file:
       - .env
       - ./envs/perffsp1.env
       - perf.override.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "25001:3001"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:
@@ -1057,25 +1036,18 @@ services:
     sysctls:
       # websockets do not have keep-alive, resulting in many TIME_WAIT sockets
       net.ipv4.tcp_tw_reuse: 1
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     # deploy:
     #   mode: replicated
     #   replicas: 1
     env_file:
       - .env
       - ./envs/perffsp2.env
       - perf.override.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "25002:3001"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:
@@ -1096,25 +1068,18 @@ services:
     sysctls:
       # websockets do not have keep-alive, resulting in many TIME_WAIT sockets
       net.ipv4.tcp_tw_reuse: 1
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     deploy:
       mode: replicated
       replicas: 1
     env_file:
       - .env
       - ./envs/perffsp3.env
       - perf.override.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "25003:3001"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:
@@ -1131,25 +1096,18 @@ services:
     sysctls:
       # websockets do not have keep-alive, resulting in many TIME_WAIT sockets
       net.ipv4.tcp_tw_reuse: 1
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     deploy:
       mode: replicated
       replicas: 1
     env_file:
       - .env
       - ./envs/perffsp4.env
       - perf.override.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "25004:3001"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:
@@ -1166,25 +1124,18 @@ services:
     sysctls:
       # websockets do not have keep-alive, resulting in many TIME_WAIT sockets
       net.ipv4.tcp_tw_reuse: 1
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     deploy:
       mode: replicated
       replicas: 1
     env_file:
       - .env
       - ./envs/perffsp5.env
       - perf.override.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "25005:3001"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:
@@ -1200,25 +1151,18 @@ services:
     sysctls:
       # websockets do not have keep-alive, resulting in many TIME_WAIT sockets
       net.ipv4.tcp_tw_reuse: 1
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     deploy:
       mode: replicated
       replicas: 1
     env_file:
       - .env
       - ./envs/perffsp6.env
       - perf.override.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "25006:3001"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:
@@ -1234,25 +1178,18 @@ services:
     sysctls:
       # websockets do not have keep-alive, resulting in many TIME_WAIT sockets
       net.ipv4.tcp_tw_reuse: 1
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     deploy:
       mode: replicated
       replicas: 1
     env_file:
       - .env
       - ./envs/perffsp7.env
       - perf.override.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "25007:3001"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:
@@ -1268,25 +1205,18 @@ services:
     sysctls:
       # websockets do not have keep-alive, resulting in many TIME_WAIT sockets
       net.ipv4.tcp_tw_reuse: 1
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     deploy:
       mode: replicated
       replicas: 1
     env_file:
       - .env
       - ./envs/perffsp8.env
       - perf.override.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "25008:3001"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:
@@ -1299,25 +1229,18 @@ services:
       - 8dfsp
 
   sim-fspiop:
-    image: mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
+    image: mojaloop/callback-handler-simulator-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     # deploy:
     #   mode: replicated
     #   replicas: 5
     env_file:
       - .env
       - ./envs/fspiop-sim.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "3001:3001"
       - "3002:3002"
     networks:
       - mojaloop-net
-    volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
     environment: {}
       # - LOG_LEVEL=error
     healthcheck:

diff --git a/docker-compose-security.yml b/docker-compose-security.yml
@@ -10,18 +10,12 @@ services:
     env_file:
       - .env
       - ./envs/fspiop-sim-security.env
-    build:
-      context: ./packages/callback-handler-svc
-      cache_from:
-        - mojaloop/callback-handler-svc:${TEST_CALLBACK_HAND_SVC_VERSION}
     ports:
       - "3001:3001"
       - "3002:3002"
     networks:
       - mojaloop-net
     volumes:
-      - ./packages/callback-handler-svc/config:/opt/app/config
-      - ./packages/callback-handler-svc/handlers:/opt/app/handlers
       - ./docker/config-modifier:/opt/app/config-modifier
     environment: {}
       # - LOG_LEVEL=error