fix ci

.gitlab-ci.yml

@@ -24,13 +24,14 @@ build-job:
   stage: build
   before_script:
     - sudo docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY
+    - cat docker-compose.test.yml
   script:
     - sudo docker pull $IMAGE_NAME:latest || true
     - sudo docker build --cache-from $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_SHORT_SHA --tag $IMAGE_NAME:latest .
     - sudo docker push $IMAGE_NAME:$CI_COMMIT_SHORT_SHA
     - sudo docker push $IMAGE_NAME:latest
   rules:
-    - if: $CI_COMMIT_BRANCH == 'ssst_main'
+    - if: $CI_COMMIT_BRANCH == 'sst_main'
 
 .deploy: &deploy-common
   stage: deploy
@@ -96,18 +97,3 @@ notify failure:
   rules:
     - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME !~ /^silent/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'sst_main'
       when: on_failure
-
-deploy:
-  stage: deploy
-  only:
-    - sst_main
-  script:
-    - cd /home/toren332/sst_postamates/
-    - sudo docker-compose down
-    - sudo git fetch
-    - sudo git reset --hard origin/sst_main
-    - sudo git submodule foreach git pull origin sst_main
-    - sudo docker-compose -f docker-compose.yml up -d
-  tags:
-    - deploy-remote
-

docker-compose.test.yml

@@ -48,7 +48,7 @@ services:
 
   loyalty-rabbit:
     image: rabbitmq:3.9-management
-    container_name: loyalty-rabbit
+    container_name: ${CONTAINERS_NAME}_loyalty-rabbit
     volumes:
       - rabbitmq_data:/var/lib/rabbitmq
       - rabbitmq_log:/var/log/rabbitmq
@@ -60,14 +60,16 @@ services:
 
   beat:
     restart: always
+    container_name: ${CONTAINERS_NAME}_beat
     image: ${IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}
     entrypoint: [ "celery", "-A", "postamates.celery:app", "beat" ]
     depends_on:
       - db
       - loyalty-rabbit
-    
+
   worker:
     restart: always
+    container_name: ${CONTAINERS_NAME}_beat
     environment:
         <<: *postgres-variables
         <<: *django-variables