fixing url for deployment

.gitlab-ci.yml

@@ -436,8 +436,7 @@ deploy:
         # This sed command finds and replaces "dsoc_ENV_secrets:" with "dsoc_${DEPLOY_ENV}_secrets:"
         - sed -i "s/dsoc_ENV_secrets:/dsoc_${DEPLOY_ENV}_secrets:/g" docker-compose.yml
         - sed -i "s/naasc_ENV_secrets:/naasc_${DEPLOY_ENV}_secrets:/g" docker-compose.yml
-        - BASE_REGISTRY_URL="${REGISTRY_URL}/workspaces/"
-        - ENV=$DEPLOY_ENV TAG=$IMAGE_TAG DL_HOST=$DL_HOST ENV_HOST=$ENV_HOST BASE_REGISTRY_URL=$BASE_REGISTRY_URL docker stack deploy --compose-file docker-compose.yml --with-registry-auth workspaces-${DEPLOY_ENV}
+        - ENV=$DEPLOY_ENV TAG=$IMAGE_TAG DL_HOST=$DL_HOST ENV_HOST=$ENV_HOST BASE_REGISTRY_URL=$REGISTRY_URL docker stack deploy --compose-file docker-compose.yml --with-registry-auth workspaces-${DEPLOY_ENV}
     rules:
         - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
           variables:

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   workflow:
-    image: ${BASE_REGISTRY_URL}/workflow:${TAG}
+    image: ${BASE_REGISTRY_URL}/workspaces/workflow:${TAG}
     build:
       context: .
       dockerfile: ./services/workflow/Dockerfile
@@ -43,7 +43,7 @@ services:
       - condor:/var/spool/condor
 
   capability:
-    image: ${BASE_REGISTRY_URL}/capability:${TAG}
+    image: ${BASE_REGISTRY_URL}/workspaces/capability:${TAG}
     build:
       context: .
       dockerfile: ./services/capability/Dockerfile
@@ -77,7 +77,7 @@ services:
         order: stop-first
 
   notification:
-    image: ${BASE_REGISTRY_URL}/notification:${TAG}
+    image: ${BASE_REGISTRY_URL}/workspaces/notification:${TAG}
     build:
       context: .
       dockerfile: ./services/notification/Dockerfile
@@ -110,7 +110,7 @@ services:
         order: stop-first
 
   web:
-    image: ${BASE_REGISTRY_URL}/web:${TAG}
+    image: ${BASE_REGISTRY_URL}/workspaces/web:${TAG}
     build:
       context: .
       dockerfile: ./apps/web/Dockerfile