Finish changing images over to marconi naming scheme

.gitlab-ci.yml

@@ -49,7 +49,7 @@ pull db image:
     stage: pull-db
     script:
         - echo "$HARBOR_PASSWORD" | docker login --username "$HARBOR_USER" --password-stdin "$REGISTRY_URL"
-        - docker pull ${REGISTRY_URL}/db:workspaces
+        - docker pull ${REGISTRY_URL}/workspaces/db:workspaces
 
 ###############################################
 # Build Pexes
@@ -437,7 +437,7 @@ go child pipeline:
         # 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
-        - 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 workspaces-${DEPLOY_ENV} -e TAG=${IMAGE_TAG}
+        - ENV=$DEPLOY_ENV TAG=$IMAGE_TAG DL_HOST=$DL_HOST ENV_HOST=$ENV_HOST docker stack deploy --compose-file docker-compose.yml workspaces-${DEPLOY_ENV} -e TAG=${IMAGE_TAG}
     rules:
         - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
           variables:

ci/build.template.yml

@@ -2,8 +2,8 @@
 .build:
     script:
         - echo "Building branch or tag -- ${IMAGE_TAG}"
-        - NAME="${BASE_REGISTRY_URL}/${SERVICE_NAME}"
-        - docker build -t ${NAME}:${IMAGE_TAG} -f ${PATH_PREFIX}${SERVICE_NAME}/Dockerfile . --build-arg DEPLOY_ENV --build-arg WS_VERSION=${VERSION} --build-arg BASE_REGISTRY_URL --build-arg CAPO_PROFILE=prod --target prod
+        - NAME="${REGISTRY_URL}/workspaces/${SERVICE_NAME}"
+        - docker build -t ${NAME}:${IMAGE_TAG} -f ${PATH_PREFIX}${SERVICE_NAME}/Dockerfile . --build-arg DEPLOY_ENV --build-arg WS_VERSION=${VERSION} --build-arg CAPO_PROFILE=prod --target prod
         - echo "TAG=${IMAGE_TAG}" >> build.env
     artifacts:
         reports:

ci/cleanup.template.yml

 # Cleanup Images Template
 .cleanup:
     script:
-        - NAME="${REGISTRY_URL}/${SERVICE_NAME}"
+        - NAME="${REGISTRY_URL}/workspaces/${SERVICE_NAME}"
         - |
             printf "%s\n" "- Removing Images -" \
             "${NAME}:${IMAGE_TAG}"
-        - docker image rm --force "${REGISTRY_URL}/${SERVICE_NAME}:${IMAGE_TAG}"
+        - docker image rm --force "${REGISTRY_URL}/workspaces/${SERVICE_NAME}:${IMAGE_TAG}"
     rules:
       - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
         variables:

ci/push.template.yml

@@ -2,7 +2,7 @@
 .push:
     script:
         - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $REGISTRY_URL
-        - NAME="${$REGISTRY_URL}/${SERVICE_NAME}"
+        - NAME="${$REGISTRY_URL}/workspaces/${SERVICE_NAME}"
         - docker push ${NAME}:${IMAGE_TAG}
     rules:
         - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'