[OPS-11357] align with hpc_service changes

Author: teodorescuserban

compose.integrated.yaml

@@ -4,30 +4,29 @@ services:
       context: .
       dockerfile: ./env/api/Dockerfile
     expose:
-      - '5100'
-      - '9393'
+      - '3000'
     ports:
       - '9339:9393'
     volumes:
       - .:/srv/www
       - ../hpc-api-core:/srv/hpc-api-core
       - ./env/api/node.sh:/etc/services.d/node/run
     environment:
-      - LOG_MODE=devServer
-      - POSTGRES_SERVER=postgres://postgres:@pgsql:5432/hpc
-      - PORT=5100
-      - NODE_ENV=development
-      - NAME=hpc-api-integrated-development
-      - POSTGRES_LOGGING=0
-      - ROOT_URL=http://service.hpc.vm/
-      - AUTHBASE_URL=http://api.hid.vm
-      - WAIT_HOSTS=pgsql:5432
-      - WAIT_HOSTS_TIMEOUT=120
+      LOG_MODE: devServer
+      POSTGRES_SERVER: postgres://postgres:@db:5432/hpc
+      PORT: 3000
+      NODE_ENV: development
+      NAME: hpc-api-integrated-development
+      POSTGRES_LOGGING: 0
+      ROOT_URL: http://service.hpc.local/
+      AUTHBASE_URL: http://api.hid.local
+      WAIT_HOSTS: db:5432, solr:8983
+      WAIT_HOSTS_TIMEOUT: 120
     networks:
-      service:
+      hpc:
         aliases:
-          - api.hpc.vm
+          - apiv4.hpc.local
 networks:
-  service:
-    name: hpcservice_service
+  hpc:
+    name: hpc
     external: true

compose.yaml

@@ -4,23 +4,21 @@ services:
       context: .
       dockerfile: ./env/api/Dockerfile
     ports:
-      - '4000:5100'
+      - '3000:3000'
     volumes:
       - .:/srv/www
       - ./env/api/node.sh:/etc/services.d/node/run
     environment:
-      - LOG_MODE=devServer
-      - POSTGRES_SERVER=postgres://demo:[email protected]:5432/demo
-      - PORT=5100
-      - NODE_ENV=development
-      - NAME=hpc-api-standalone-development
-      - POSTGRES_LOGGING=0
-      - ROOT_URL=http://service.hpc.vm/
-      - AUTHBASE_URL=http://api.hid.vm
-      - WAIT_HOSTS=host.docker.internal:5432
-      - WAIT_HOSTS_TIMEOUT=120
-    links:
-      - db
+      LOG_MODE: devServer
+      POSTGRES_SERVER: postgres://demo:demo@db:5432/demo
+      PORT: 3000
+      NODE_ENV: development
+      NAME: hpc-api-standalone-development
+      POSTGRES_LOGGING: 0
+      ROOT_URL: http://service.hpc.local/
+      AUTHBASE_URL: http://api.hid.local
+      WAIT_HOSTS: db:5432
+      WAIT_HOSTS_TIMEOUT: 120
     depends_on:
       - db
   db: