Merge branch 'prod_back_animation' into develop_back_notification

tukcomCD2024 · Aug 4, 2024 · c875c81 · c875c81
2 parents 758a45e + 7edfe73
commit c875c81
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 119 deletions.
diff --git a/.github/workflows/animation-application-ci-cd-flow.yml b/.github/workflows/animation-application-ci-cd-flow.yml
diff --git a/.github/workflows/animation-application-prod-ci-cd-flow.yml b/.github/workflows/animation-application-prod-ci-cd-flow.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - prod_back_animation
-      - build/cicd-prod-B-#580
       - 'hotfix/[0-9a-zA-z]+-B-animation-#[0-9a-zA-z]+'
   pull_request:
     branches:
@@ -31,11 +30,6 @@ jobs:
           submodules: true
           token: ${{ secrets.CI_PAT }}
 
-      - name: move yaml files
-        run: |
-          mkdir -p ./config/yaml
-          cp -r ../core/src/main/resources/config ./application/config/yaml
-
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -84,9 +78,9 @@ jobs:
             docker ps -q --filter "name=animated_drawings" | xargs -r docker stop
             docker ps -aq --filter "name=animated_drawings" | xargs -r docker rm
             aws ecr get-login-password --region ${{ secrets.AWS_REGION }} | docker login --username ${{ secrets.AWS_DOCKER_USER }} --password-stdin ${{ secrets.AWS_USER_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com
-            docker image prune -f
+            docker image prune -f -a
             docker pull ${{ steps.meta.outputs.tags }}
-            docker run -d -p 5555:5555 -p 9001:9001 --name animated_drawings -v log_volume:/app/application/log -e ENVIRONMENT='dev' ${{ steps.meta.outputs.tags }}
+            docker run -d -p 5555:5555 -p 9001:9001 --name animated_drawings -v ./log_volume:/app/application/log -e ENVIRONMENT='prod' ${{ steps.meta.outputs.tags }}
 
       - name: Remove Github Actions IP from security group
         if: always()

diff --git a/backend/AnimatedDrawings/application/config/yml b/backend/AnimatedDrawings/application/config/yml
diff --git a/backend/AnimatedDrawings/supervisord.conf b/backend/AnimatedDrawings/supervisord.conf
@@ -4,8 +4,9 @@ loglevel=info
 
 [inet_http_server]
 port = *:9001
-username = user
-password = 1234
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [program:flower]
 directory = /app/application
@@ -34,7 +35,7 @@ environment=ENVIRONMENT=%(ENV_ENVIRONMENT)s,PYOPENGL_PLATFORM="osmesa"
 
 [program:celery]
 directory = /app/application
-command = /opt/conda/envs/animated_drawings/bin/celery -A celery_app worker
+command = /opt/conda/envs/animated_drawings/bin/celery -A celery_app worker --without-heartbeat --without-gossip --without-mingle
 priority = 200
 loglevel=info
 stdout_logfile = /app/application/log/celeryd.log