Skip to content

Commit d29cc4b

Browse files
authored
Merge pull request #334 from boostcampwm-2024/refactor/docker-ci-cd
🐛 fix: docker compose 운영 인프라 include 오류
2 parents dce54bb + 3e4ddc6 commit d29cc4b

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

.github/workflows/deploy_server.yml

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
echo "REDIS_PASSWORD=${{secrets.REDIS_PASSWORD}}" >> env/.env.prod
4040
echo "EMAIL_USER=${{secrets.EMAIL_USER}}" >> env/.env.prod
4141
echo "EMAIL_PASSWORD=${{secrets.EMAIL_PASSWORD}}" >> env/.env.prod
42-
echo "AI_API_KEY=${{secrets.AI_API_KEY}}" >> env/.env.prod
4342
4443
cd /var/web05-Denamu
4544
docker-compose -f docker-compose/docker-compose.prod.yml up --build -d app

docker-compose/docker-compose.prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: denamu-production
22

33
include:
4-
- docker-compose.infra.yml
4+
- docker-compose.prod.infra.yml
55

66
services:
77
# WAS 서비스

feed-crawler/docker/Dockerfile.dev

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,4 @@ COPY --from=builder /var/web05-Denamu/feed-crawler/node_modules ./node_modules
1616

1717
RUN touch /var/log/feed-crawler.log
1818

19-
RUN echo "*/30 * * * * cd /var/web05-Denamu/feed-crawler && npm run start:dev >> /var/log/feed-crawler.log 2>&1" >> /etc/crontabs/root
20-
21-
CMD ["sh", "-c", "crond && tail -f /var/log/feed-crawler.log"]
19+
CMD ["sh", "-c", "npm run start:dev && tail -f /var/log/feed-crawler.log"]

feed-crawler/docker/Dockerfile.local

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,4 @@ COPY --from=builder /var/web05-Denamu/feed-crawler/env ./env
1919

2020
RUN touch /var/log/feed-crawler.log
2121

22-
RUN echo "*/30 * * * * cd /var/web05-Denamu/feed-crawler && npm run start >> /var/log/feed-crawler.log 2>&1" > /etc/crontabs/root
23-
24-
CMD ["sh", "-c", "crond && tail -f /var/log/feed-crawler.log"]
22+
CMD ["sh", "-c", "npm run start && tail -f /var/log/feed-crawler.log"]

0 commit comments

Comments
 (0)