Merge pull request #58 from themoment-team/CICD

Cicd
themoment-team · Aug 3, 2023 · 0866e95 · 0866e95
2 parents 513380d + 8f51dfe
commit 0866e95
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/prod-ci.yml b/.github/workflows/prod-ci.yml
@@ -63,6 +63,9 @@ jobs:
           touch scripts/prod-deploy.sh
           echo "aws ecr get-login-password --region ap-northeast-2 | docker login --username AWS --password-stdin $ECR_REGISTRY" >> scripts/prod-deploy.sh
           echo "docker pull $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/prod-deploy.sh
+          echo "docker image prune -f" >> scripts/prod-deploy.sh
+          echo "docker stop official-prod-client-server" >> scripts/prod-deploy.sh
+          echo "docker rm official-prod-client-server" >> scripts/prod-deploy.sh
           echo "docker run -p 8080:8080 -d --restart always --name official-prod-client-server $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/prod-deploy.sh
 
       - name: upload to s3

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,19 +2,15 @@ version: "3.3"
 
 services:
 
-  redis:
-    image: redis
-    restart: always
-    ports:
-      - "6379:6379"
-
   app:
     image: official-test-server:client
     expose:
       - 56829
     ports:
       - "56829:8080"
-    depends_on:
-      - redis
-    links:
-      - redis
+    logging:
+      driver: awslogs
+      options:
+        awslogs-group: "official-admin-test"
+        awslogs-region: "ap-northeast-2"
+        awslogs-stream: "client-spring-logging"